diff --git a/src/ui/public/vis/editors/default/default.js b/src/ui/public/vis/editors/default/default.js
index 500b266b97fb78..518a16378f51f8 100644
--- a/src/ui/public/vis/editors/default/default.js
+++ b/src/ui/public/vis/editors/default/default.js
@@ -17,7 +17,7 @@ const defaultEditor = function ($rootScope, $compile) {
 
       if (!this.vis.type.editorConfig.optionTabs && this.vis.type.editorConfig.optionsTemplate) {
         this.vis.type.editorConfig.optionTabs = [
-          { name: 'options', title: 'Options', editor: this.editorConfig.optionsTemplate }
+          { name: 'options', title: 'Options', editor: this.vis.type.editorConfig.optionsTemplate }
         ];
       }
     }
diff --git a/src/ui/public/vis/editors/default/vis_options.js b/src/ui/public/vis/editors/default/vis_options.js
index dfe8c98ec78ac3..7096e51afeaa81 100644
--- a/src/ui/public/vis/editors/default/vis_options.js
+++ b/src/ui/public/vis/editors/default/vis_options.js
@@ -28,7 +28,7 @@ uiModules
       const reactOptionsComponent = typeof $scope.editor !== 'string';
       const renderReactComponent = () => {
         const Component = $scope.editor;
-        render(<Component scope={$scope} />, $el);
+        render(<Component scope={$scope} />, $el[0]);
       };
       // Bind the `editor` template with the scope.
       if (reactOptionsComponent) {
@@ -50,7 +50,7 @@ uiModules
 
       $el.on('$destroy', () => {
         if (reactOptionsComponent) {
-          unmountComponentAtNode($el);
+          unmountComponentAtNode($el[0]);
         }
       });
     }