diff --git a/src/imagetoolbar.js b/src/imagetoolbar.js
index db15a971..f7cb8fba 100644
--- a/src/imagetoolbar.js
+++ b/src/imagetoolbar.js
@@ -70,7 +70,8 @@ export default class ImageToolbar extends Plugin {
 		Template.extend( panel.template, {
 			attributes: {
 				class: [
-					'ck-toolbar-container'
+					'ck-toolbar-container',
+					'ck-editor-toolbar-container'
 				]
 			}
 		} );
diff --git a/tests/imagetoolbar.js b/tests/imagetoolbar.js
index 529b519d..07d0824f 100644
--- a/tests/imagetoolbar.js
+++ b/tests/imagetoolbar.js
@@ -58,6 +58,7 @@ describe( 'ImageToolbar', () => {
 
 	it( 'should set css classes', () => {
 		expect( panel.element.classList.contains( 'ck-toolbar-container' ) ).to.be.true;
+		expect( panel.element.classList.contains( 'ck-editor-toolbar-container' ) ).to.be.true;
 		expect( panel.content.get( 0 ).element.classList.contains( 'ck-editor-toolbar' ) ).to.be.true;
 	} );