diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index 65626e649c65..772c5436822e 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -655,9 +655,16 @@ function UpdateBookmarksLastVisitedDate(event)
     if (url.substring(0, 3) == "NC:") {
       return false;
     }
-
-    window.content.location.href = url;
-    RefreshUrlbar();
+	// Check if we have a browser window
+	if ( window.content == null )
+	{
+		window.openDialog( "chrome://navigator/content/navigator.xul", "_blank", "chrome,all,dialog=no", url ); 
+	}
+	else
+	{
+  	  window.content.location.href = url;
+    	RefreshUrlbar();
+  	}
   }
 
 function OpenSearch(tabName, searchStr)
diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 86fef7e3feeb..14d04cd5de74 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -259,21 +259,21 @@ Contributor(s): ______________________________________. -->
     ondraggesture="return BeginDragPersonalToolbar(event);"
     ondragdrop="return DropPersonalToolbar(event);"
     ondragover="return DragOverPersonalToolbar(event);"
-    onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')">
+   >
 
     <!-- This template builds content from the bookmarks datasource -->
     <template>
       <!-- Rules for content hanging _directly_ off the toolbar -->
       <rule parent="toolbar" iscontainer="true">
         <menu uri="...">
-          <titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
+          <titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"  onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"
             align="left" />
           <menupopup />
         </menu>
       </rule>
       <rule parent="toolbar">
         <titledbutton uri="..." align="left" 
-          value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+          value="rdf:http://home.netscape.com/NC-rdf#Name"  onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"/>
       </rule>
 
       <!-- Recursive rules for nested folders -->
@@ -288,7 +288,7 @@ Contributor(s): ______________________________________. -->
       <rule>
         <menupopup>
           <menuitem align="left" uri="..." 
-            value="rdf:http://home.netscape.com/NC-rdf#Name" />
+            value="rdf:http://home.netscape.com/NC-rdf#Name"  onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"/>
         </menupopup>
       </rule>
     </template>
diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index 65626e649c65..772c5436822e 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -655,9 +655,16 @@ function UpdateBookmarksLastVisitedDate(event)
     if (url.substring(0, 3) == "NC:") {
       return false;
     }
-
-    window.content.location.href = url;
-    RefreshUrlbar();
+	// Check if we have a browser window
+	if ( window.content == null )
+	{
+		window.openDialog( "chrome://navigator/content/navigator.xul", "_blank", "chrome,all,dialog=no", url ); 
+	}
+	else
+	{
+  	  window.content.location.href = url;
+    	RefreshUrlbar();
+  	}
   }
 
 function OpenSearch(tabName, searchStr)
diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index 86fef7e3feeb..14d04cd5de74 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -259,21 +259,21 @@ Contributor(s): ______________________________________. -->
     ondraggesture="return BeginDragPersonalToolbar(event);"
     ondragdrop="return DropPersonalToolbar(event);"
     ondragover="return DragOverPersonalToolbar(event);"
-    onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')">
+   >
 
     <!-- This template builds content from the bookmarks datasource -->
     <template>
       <!-- Rules for content hanging _directly_ off the toolbar -->
       <rule parent="toolbar" iscontainer="true">
         <menu uri="...">
-          <titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
+          <titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"  onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"
             align="left" />
           <menupopup />
         </menu>
       </rule>
       <rule parent="toolbar">
         <titledbutton uri="..." align="left" 
-          value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+          value="rdf:http://home.netscape.com/NC-rdf#Name"  onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"/>
       </rule>
 
       <!-- Recursive rules for nested folders -->
@@ -288,7 +288,7 @@ Contributor(s): ______________________________________. -->
       <rule>
         <menupopup>
           <menuitem align="left" uri="..." 
-            value="rdf:http://home.netscape.com/NC-rdf#Name" />
+            value="rdf:http://home.netscape.com/NC-rdf#Name"  onclick="OpenBookmarkURL(event.target, 'PersonalToolbar')"/>
         </menupopup>
       </rule>
     </template>