diff --git a/common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html b/common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html
index c83a145622..7c0f7be2b7 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html
@@ -1,33 +1,35 @@
-<div class="base_wrapper">
-    <section class="editor-with-tabs">
-        <div class="wrapper-comp-editor" id="editor-tab-id" data-html_id='test_id'>
-        <div class="edit-header">
-            <ul class="editor-tabs">
-                <li  class="inner_tab_wrap"><a href="#tab-0" class="tab">Tab 0 Editor</a></li>
-                <li  class="inner_tab_wrap"><a href="#tab-1" class="tab">Tab 1 Transcripts</a></li>
-                <li  class="inner_tab_wrap" id="settings"><a href="#tab-2" class="tab">Tab 2 Settings</a></li>
-            </ul>
-           	</div>
-            <div class="tabs-wrapper">
-                <div class="component-tab" id="tab-0">
-                    <textarea name="" class="edit-box">XML Editor Text</textarea>
+<div class="component-editor">
+    <div class="base_wrapper">
+        <section class="editor-with-tabs">
+            <div class="wrapper-comp-editor" id="editor-tab-id" data-html_id='test_id'>
+            <div class="edit-header">
+                <ul class="editor-tabs">
+                    <li  class="inner_tab_wrap"><a href="#tab-0" class="tab">Tab 0 Editor</a></li>
+                    <li  class="inner_tab_wrap"><a href="#tab-1" class="tab">Tab 1 Transcripts</a></li>
+                    <li  class="inner_tab_wrap" id="settings"><a href="#tab-2" class="tab">Tab 2 Settings</a></li>
+                </ul>
+               	</div>
+                <div class="tabs-wrapper">
+                    <div class="component-tab" id="tab-0">
+                        <textarea name="" class="edit-box">XML Editor Text</textarea>
+                    </div>
+                    <div class="component-tab" id="tab-1">
+                       Transcripts
+                    </div>
+                    <div class="component-tab" id="tab-2">
+                        Subtitles
+                    </div>
                 </div>
-                <div class="component-tab" id="tab-1">
-                   Transcripts
-                </div>
-                <div class="component-tab" id="tab-2">
-                    Subtitles
+                <div class="wrapper-comp-settings">
+        	  <ul>
+                    <li id="editor-mode"><a>Editor</a></li>
+                    <li id="settings-mode"><a>Settings</a></li>
+                </ul>
                 </div>
             </div>
-            <div class="wrapper-comp-settings">
-    	  <ul>
-                <li id="editor-mode"><a>Editor</a></li>
-                <li id="settings-mode"><a>Settings</a></li>
-            </ul>
-            </div>
-        </div>
-    </section>
+        </section>
 
-    <div class="component-edit-header" style="display: block"/>
+        <div class="component-edit-header" style="display: block"/>
+    </div>
 </div>
 
diff --git a/common/lib/xmodule/xmodule/js/spec/tabs/edit.coffee b/common/lib/xmodule/xmodule/js/spec/tabs/edit.coffee
index 734e398c74..d5502b7a29 100644
--- a/common/lib/xmodule/xmodule/js/spec/tabs/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/tabs/edit.coffee
@@ -65,7 +65,7 @@ describe "TabsEditingDescriptor", ->
 
   describe "editor/settings header", ->
     it "is hidden", ->
-      expect(@descriptor.element.find(".component-edit-header").css('display')).toEqual('none')
+      expect(@descriptor.element.closest(".component-editor").find(".component-edit-header")).toBeHidden()
 
 describe "TabsEditingDescriptor special save cases", ->
   beforeEach ->
diff --git a/common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.coffee b/common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.coffee
index 7c6e85e34b..521b19dfbc 100644
--- a/common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.coffee
+++ b/common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.coffee
@@ -9,7 +9,7 @@ class @TabsEditingDescriptor
     ###
 
     # hide editor/settings bar
-    $('.component-edit-header').hide()
+    @element.closest('.component-editor').find('.component-edit-header').hide()
 
     @$tabs = $(".tab", @element)
     @$content = $(".component-tab", @element)