diff --git a/cms/static/client_templates/metadata_editor.html b/cms/static/client_templates/metadata_editor.html
index 92f053ca9f..bf618bd6f1 100644
--- a/cms/static/client_templates/metadata_editor.html
+++ b/cms/static/client_templates/metadata_editor.html
@@ -1,9 +1,7 @@
-<div class="wrapper-comp-settings" id="settings-tab">
-	<ul class="list-input settings-list">
-	    <% _.each(metadata_entries, function(entry) { %>
-	    <li class="field comp-setting-entry">
-	        <div class='metadata_entry' />
-	    </li>
-	    <% }) %>
-	</ul>
-</div>
\ No newline at end of file
+<ul class="list-input settings-list">
+    <% _.each(metadata_entries, function(entry) { %>
+    <li class="field comp-setting-entry">
+        <div class='metadata_entry' />
+    </li>
+    <% }) %>
+</ul>
\ No newline at end of file
diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee
index eeda00638a..8a6db67e3a 100644
--- a/cms/static/coffee/src/views/module_edit.coffee
+++ b/cms/static/coffee/src/views/module_edit.coffee
@@ -8,6 +8,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
     "click .component-actions .edit-button": 'clickEditButton'
     "click .component-actions .delete-button": 'onDelete'
 
+
   initialize: ->
     @onDelete = @options.onDelete
     @render()
diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html
index 7c4a1bde7b..17f86a89dc 100644
--- a/cms/templates/widgets/html-edit.html
+++ b/cms/templates/widgets/html-edit.html
@@ -1,4 +1,3 @@
-<%include file="metadata-edit.html" />
 <div class="wrapper-comp-editor" id="editor-tab">
     <section class="html-editor editor">
       <ul class="editor-tabs">
@@ -12,3 +11,4 @@
       </div>
     </section>
 </div>
+<%include file="metadata-edit.html" />
diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html
index c1e2654724..8367011c42 100644
--- a/cms/templates/widgets/metadata-edit.html
+++ b/cms/templates/widgets/metadata-edit.html
@@ -8,7 +8,7 @@
 % if 'source_code' in json_metadata_data:
     <% del json_metadata_data['source_code'] %>
 % endif
-<section class="metadata_edit" data-metadata='${json.dumps(json_metadata_data)}'/>
+<div class="wrapper-comp-settings metadata_edit" id="settings-tab" data-metadata='${json.dumps(json_metadata_data)}'/>
 
 % if showHighLevelSource:
     <a href="#hls-modal-${hlskey}" style="color:yellow;" id="hls-trig-${hlskey}" >Edit High Level Source</a>
diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html
index 908112cd01..e2856d731a 100644
--- a/cms/templates/widgets/problem-edit.html
+++ b/cms/templates/widgets/problem-edit.html
@@ -1,4 +1,3 @@
-<%include file="metadata-edit.html" />
 <div class="wrapper-comp-editor" id="editor-tab">
 <section class="problem-editor editor">
     <div class="row">
@@ -106,4 +105,5 @@
         </div>
     </article>
 </script>
-</div>
\ No newline at end of file
+</div>
+<%include file="metadata-edit.html" />
\ No newline at end of file
diff --git a/cms/templates/widgets/raw-edit.html b/cms/templates/widgets/raw-edit.html
index be41fad887..2b1b0f9ef3 100644
--- a/cms/templates/widgets/raw-edit.html
+++ b/cms/templates/widgets/raw-edit.html
@@ -1,6 +1,6 @@
-<%include file="metadata-edit.html" />
 <div class="wrapper-comp-editor" id="editor-tab">
     <section class="raw-edit">
       <textarea name="" class="edit-box" rows="8" cols="40">${data | h}</textarea>
     </section>
 </div>
+<%include file="metadata-edit.html" />
diff --git a/cms/templates/widgets/sequence-edit.html b/cms/templates/widgets/sequence-edit.html
index c70f2568fa..7956fbfbaf 100644
--- a/cms/templates/widgets/sequence-edit.html
+++ b/cms/templates/widgets/sequence-edit.html
@@ -29,7 +29,6 @@
     </ul>
   </section>
 
-  <%include file="metadata-edit.html" />
   <div class="content">
     <section class="modules">
       <ol>
@@ -50,5 +49,6 @@
       </ol>
     </section>
   </div>
+  <%include file="metadata-edit.html" />
 </section>