diff --git a/cms/templates/js/mock/mock-modal.underscore b/cms/templates/js/mock/mock-modal.underscore
index 5d23780160..bd8d226082 100644
--- a/cms/templates/js/mock/mock-modal.underscore
+++ b/cms/templates/js/mock/mock-modal.underscore
@@ -1,6 +1,6 @@
 <div class="wrapper wrapper-modal-window wrapper-modal-window-mock">
-    <div class="modal-window confirm modal-editor modal-lg modal-type-<%= xblockInfo.get('category') %>">
-        <form class="edit-xblock-modal" action="#">
+    <div class="modal-window confirm modal-editor modal-lg modal-type-html %>">
+        <div class="edit-xblock-modal" action="#">
             <div class="modal-header">
                 <h2 class="title modal-window-title">Mock Modal Title</h2>
             </div>
@@ -17,6 +17,6 @@
                 </li>
                 </ul>
             </div>
-        </form>
+        </div>
     </div>
 </div>
diff --git a/common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html b/common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html
index 7c0f7be2b7..1633ebfebc 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html
@@ -1,35 +1,49 @@
-<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="wrapper-comp-settings">
-        	  <ul>
-                    <li id="editor-mode"><a>Editor</a></li>
-                    <li id="settings-mode"><a>Settings</a></li>
-                </ul>
-                </div>
+<div class="wrapper wrapper-modal-window wrapper-modal-window-mock">
+    <div class="modal-window confirm modal-editor modal-lg modal-type-<%= xblockInfo.get('category') %>">
+        <div class="edit-xblock-modal" action="#">
+            <div class="modal-header">
+                <h2 class="title modal-window-title">Mock Modal Title</h2>
             </div>
-        </section>
-
-        <div class="component-edit-header" style="display: block"/>
+            <div class="modal-content">
+                <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="wrapper-comp-settings">
+                            <ul>
+                                <li id="editor-mode"><a>Editor</a></li>
+                                <li id="settings-mode"><a>Settings</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </section>
+            </div>
+            <div class="modal-actions">
+                <ul>
+                    <li class="action-item">
+                        <a href="#" class="button action-primary action-save">Save</a>
+                    </li>
+                    <li class="action-item">
+                        <a href="#" class="button action-secondary action-cancel">Cancel</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
     </div>
 </div>
-