Index: branches/5.1.x/core/admin_templates/themes/template_edit.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/themes/template_edit.tpl	(.../template_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/themes/template_edit.tpl	(.../template_edit.tpl)	(revision 12657)
@@ -15,10 +15,19 @@
 						}
 					) );
 
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('theme-file', 'OnGoBack');
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'cancel',
+						'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
+						function() {
+							<inp2:m_if check="adm_UsePopups">
+								window_close();
+							<inp2:m_else/>
+								submit_event('theme-file', 'OnGoBack');
+							</inp2:m_if>
 						}
-				 ) );
+					)
+				);
 
 				a_toolbar.Render();
 			</script>
@@ -39,7 +48,13 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="FileName" title="la_fld_FileName"/>
 		<inp2:m_RenderElement name="inp_label" prefix="theme-file" field="BlockPosition" title="la_fld_BlockPosition"/>
-		<inp2:m_RenderElement name="inp_edit_codepress" prefix="theme-file" field="FileContents" title="la_fld_FileContents"/>
+
+		<inp2:m_if check="adm_UsePopups">
+			<inp2:m_RenderElement name="inp_edit_codepress" prefix="theme-file" field="FileContents" title="la_fld_FileContents"/>
+		<inp2:m_else/>
+			<inp2:m_RenderElement name="inp_edit_codepress" prefix="theme-file" field="FileContents" title="la_fld_FileContents" style="width: 100%; height: 500px;"/>
+		</inp2:m_if>
+
 		<!--<inp2:m_RenderElement name="inp_edit_filler" control_options="{height: 8}"/>-->
 	</table>
 </div>