diff --git a/src/kibana/plugins/visualize/editor/sidebar.html b/src/kibana/plugins/visualize/editor/sidebar.html
index 977b3cf7fbf25..d1680538ee79c 100644
--- a/src/kibana/plugins/visualize/editor/sidebar.html
+++ b/src/kibana/plugins/visualize/editor/sidebar.html
@@ -17,26 +17,27 @@
       </vis-editor-vis-options>
 
       <!-- apply/discard -->
-      <li class="vis-editor-sidebar-buttons sidebar-item">
-        <p
-          ng-if="visualizeEditor.$invalid"
-          class="text-center text-danger sidebar-item-text">
-          <i class="fa fa-warning"></i> {{visualizeEditor.describeErrors()}}
-        </p>
-        <button
-          ng-disabled="!vis.dirty || visualizeEditor.$invalid"
-          type="submit"
-          class="sidebar-item-button success">
-          Apply
-        </button>
-        <button
-          ng-disabled="!vis.dirty"
-          type="button"
-          ng-click="resetEditableVis()"
-          class="sidebar-item-button default">
-          Discard
-        </button>
-      </li>
     </ul>
+    <div class="vis-editor-sidebar-buttons">
+      <p
+        ng-if="visualizeEditor.$invalid"
+        class="text-center text-danger sidebar-item-text">
+        <i class="fa fa-warning"></i> {{visualizeEditor.describeErrors()}}
+      </p>
+      <button
+        ng-disabled="!vis.dirty || visualizeEditor.$invalid"
+        type="submit"
+        class="sidebar-item-button success">
+        Apply
+      </button>
+      <button
+        ng-disabled="!vis.dirty"
+        type="button"
+        ng-click="resetEditableVis()"
+        class="sidebar-item-button default">
+        Discard
+      </button>
+    </div>
   </form>
-</div>
\ No newline at end of file
+</div>
+
diff --git a/src/kibana/plugins/visualize/editor/styles/editor.less b/src/kibana/plugins/visualize/editor/styles/editor.less
index 62229443cf134..5ea468dbc0151 100644
--- a/src/kibana/plugins/visualize/editor/styles/editor.less
+++ b/src/kibana/plugins/visualize/editor/styles/editor.less
@@ -50,33 +50,38 @@
   &-sidebar {
     .flex-parent(0, 0, auto);
 
-    overflow: auto;
+    // overflow: auto;
 
     // overrided for tablet and desktop
     @media (min-width: @screen-md-min) {
       .flex-basis(@vis-editor-sidebar-basis);
       min-width: @vis-editor-sidebar-min-width;
       max-width: @vis-editor-sidebar-min-width;
-      margin-bottom: (@input-height-base * 2) - 3;
+      // margin-bottom: (@input-height-base * 2) - 3;
     }
 
-    &-buttons {
-      // overrides for tablet and desktop
-      @media (min-width: @screen-md-min) {
-        position: absolute;
-        bottom: 0;
-        min-width: @vis-editor-sidebar-min-width;
-      }
-    }
 
     .sidebar-item {
       border-top: 0 !important;
     }
 
     .sidebar-container {
-      .flex(1, 0, auto);
+      .flex-parent(1, 1, auto);
       background-color: @body-bg;
       border-right-color: @sidebar-bg;
+
+      form {
+        .flex-parent(1, 1, auto);
+
+        > ul {
+          .flex(1, 1, auto);
+          overflow-y: auto;
+        }
+
+        > .vis-edit-sidebar-buttons {
+          .flex(0, 0, auto)
+        }
+      }
     }
 
     .sidebar-item-title {