diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.html b/src/core_plugins/kibana/public/visualize/editor/editor.html
index e5535094f24cc..d675297daffa6 100644
--- a/src/core_plugins/kibana/public/visualize/editor/editor.html
+++ b/src/core_plugins/kibana/public/visualize/editor/editor.html
@@ -73,11 +73,14 @@
 
   <div class="vis-editor-content">
 
-    <div class="collapsible-sidebar" ng-if="chrome.getVisible()">
-        <vis-editor-sidebar class="vis-editor-sidebar"></vis-editor-sidebar>
+    <vis-editor-vis-options ng-if="vis.type.fullEditor" vis="vis" saved-vis="savedVis" ui-state="uiState"
+                            class="vis-editor-full-options"></vis-editor-vis-options>
+
+    <div class="collapsible-sidebar" ng-if="!vis.type.fullEditor && chrome.getVisible()" >
+      <vis-editor-sidebar class="vis-editor-sidebar"></vis-editor-sidebar>
     </div>
 
-    <div class="vis-editor-canvas" ng-class="{ embedded: !chrome.getVisible() }">
+    <div class="vis-editor-canvas" ng-if="!vis.type.fullEditor" ng-class="{ embedded: !chrome.getVisible() }">
       <visualize
         vis="vis"
         render-counter
@@ -87,5 +90,6 @@
         search-source="savedVis.searchSource">
       </visualize>
     </div>
+
   </div>
 </visualize-app>
diff --git a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
index a5b4da6db1abf..22a9ecb2771b1 100644
--- a/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/core_plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -128,6 +128,13 @@
     }
   }
 
+  .vis-editor-full-options .visualization-options {
+    display: flex;
+    flex-direction: column;
+    flex: 1 0 auto;
+    padding: 0px;
+  }
+
   .vis-editor-agg {
     .flex-parent();
 
diff --git a/src/ui/public/vis/vis_type.js b/src/ui/public/vis/vis_type.js
index 20ec1044ee17d..909434848dcc8 100644
--- a/src/ui/public/vis/vis_type.js
+++ b/src/ui/public/vis/vis_type.js
@@ -15,6 +15,7 @@ export default function VisTypeFactory(Private) {
     this.schemas = opts.schemas || new VisTypeSchemas();
     this.params = opts.params || {};
     this.requiresSearch = opts.requiresSearch == null ? true : opts.requiresSearch; // Default to true unless otherwise specified
+    this.fullEditor = opts.fullEditor == null ? false : opts.fullEditor;
     this.implementsRenderComplete = opts.implementsRenderComplete || false;
   }