diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 6e172d2b3..6a85b8fd2 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -93,7 +93,7 @@ if(e_AJAX_REQUEST)
 	exit;
 }
 
-if(isset($_GET['configure']))
+if(isset($_GET['configure']) || isset($_GET['iframe']))
 {
 	//No layout parse when in iframe mod
 	define('e_IFRAME', true);
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index 95739b5d3..f25355f7c 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -508,7 +508,7 @@ class e_menuManager {
 		$menu_pages = str_replace("|", "\n", $menu_pages);
 
 		$text = "<div style='text-align:center;'>
-		<form  method='post' action='".e_SELF."?lay=".$this->curLayout."'>
+		<form  method='post' action='".e_SELF."?lay=".$this->curLayout."&amp;iframe=1'>
         <fieldset id='core-menus-visibilityform'>
 		<legend>". MENLAN_7." ".$row['menu_name']."</legend>
         <table class='adminform'>
@@ -1208,7 +1208,7 @@ class e_menuManager {
 		//DEBUG remove inline style, switch to simple quoted string for title text value
 		//TODO hardcoded text
 		$text .= '<div class="center">
-		<a target="_top" href="'.e_SELF.'?lay='.$this->curLayout.'&amp;vis='.$menu_id.'" title="'.MENLAN_20.'">'.ADMIN_VIEW_ICON.'</a>';
+		<a class="e-dialog" target="_top" href="'.e_SELF.'?lay='.$this->curLayout.'&amp;vis='.$menu_id.'&amp;iframe=1" title="'.MENLAN_20.'">'.ADMIN_VIEW_ICON.'</a>';
 
 		if($conf)
 		{
diff --git a/e107_themes/_blank/admin_template.php b/e107_themes/_blank/admin_template.php
index c298f0ddc..d2f73c969 100644
--- a/e107_themes/_blank/admin_template.php
+++ b/e107_themes/_blank/admin_template.php
@@ -25,6 +25,14 @@ define("ADLINK_COLS",5);
 
 include_lan(e_THEME."_blank/languages/".e_LANGUAGE.".php");
 
+
+$ADMIN_LOGIN = "<div class='admin-wrapper'>Something</div>"; // TODO
+
+
+
+
+
+
 //{FS_ADMIN_ALT_NAV}
 $ADMIN_HEADER = "
 <div class='admin-wrapper'>