diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index c8f70a31899b..9a429b2753a4 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -103,6 +103,14 @@ function contentAreaFrameFocus()
   }
 }
 
+function editPageOrFrame()
+{
+  if (gFocusedURL)
+    editPage(gFocusedURL, window, false);
+  else
+    editPage(window._content.location.href, window, false);
+}
+
 //////////////////////////////// BOOKMARKS ////////////////////////////////////
 
 function UpdateBookmarksLastVisitedDate(event)
diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index facdd239c8db..40d047b05d4f 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -109,7 +109,7 @@
     <command id="cmd_newEditorDraft"/> -->
     <command id="Browser:OpenFile"  oncommand="BrowserOpenFileWindow();"/>
     <command id="Browser:SavePage" oncommand="saveDocument(window._content.document);"/>
-    <command id="Browser:EditPage" oncommand="editPage(window._content.location.href,window, false);"/>
+    <command id="Browser:EditPage" oncommand="editPageOrFrame();"/>
     <command id="Browser:Open" oncommand="BrowserOpenWindow();"/>
     <command id="Browser:PrintSetup" oncommand="BrowserPrintSetup();"/>
     <command id="Browser:Print" oncommand="BrowserPrint();"/>