diff --git a/src/plugins/kibana/public/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html
index 6841fbca8190a..1f9bd00591ae0 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.html
+++ b/src/plugins/kibana/public/visualize/editor/editor.html
@@ -126,7 +126,9 @@
 
   <div class="vis-editor-content">
 
-    <vis-editor-sidebar class="vis-editor-sidebar" ng-if="chrome.getVisible()"></vis-editor-sidebar>
+    <div class="collapsible-sidebar">
+        <vis-editor-sidebar class="vis-editor-sidebar" ng-if="chrome.getVisible()"></vis-editor-sidebar>
+    </div>
 
     <div class="vis-editor-canvas" ng-class="{ embedded: !chrome.getVisible() }">
       <div class="visualize-info" ng-if="savedVis.id">
diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js
index 963dfbccda0c1..b48616998cc49 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.js
+++ b/src/plugins/kibana/public/visualize/editor/editor.js
@@ -6,6 +6,7 @@ define(function (require) {
 
   require('ui/visualize');
   require('ui/clipboard');
+  require('ui/collapsible_sidebar');
 
   require('ui/routes')
   .when('/visualize/create', {
diff --git a/src/plugins/kibana/public/visualize/editor/styles/_editor.less b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
index 38e7eabfe6099..fa44896cbada2 100644
--- a/src/plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -64,8 +64,12 @@
     }
   }
 
-  &-sidebar {
+  .collapsible-sidebar {
     .flex-parent(0, 0, auto);
+  }
+
+  &-sidebar {
+    .flex-parent(1, 0, auto);
 
     // overrided for tablet and desktop
     @media (min-width: @screen-md-min) {
diff --git a/src/ui/public/collapsible_sidebar/collapsible_sidebar.less b/src/ui/public/collapsible_sidebar/collapsible_sidebar.less
index 5418f4f8e7dda..537b906b89d3d 100644
--- a/src/ui/public/collapsible_sidebar/collapsible_sidebar.less
+++ b/src/ui/public/collapsible_sidebar/collapsible_sidebar.less
@@ -1,6 +1,6 @@
 @import (reference) "~ui/styles/variables";
 
-.sidebar-container.collapsible-sidebar {
+.collapsible-sidebar {
   position: relative;
   z-index: 1;
 
@@ -61,7 +61,7 @@
 }
 
 @media (max-width: 992px) {
-  .sidebar-container.collapsible-sidebar {
+  .collapsible-sidebar {
     &.closed {
       display: none;
     }