diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index e69dd86942..a972b7a215 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -943,6 +943,9 @@ pref("security.alternate_certificate_error_page", "certerror");
 // Whether to start the private browsing mode at application startup
 pref("browser.privatebrowsing.autostart", false);
 
+// Whether to immediately open the bookmark edit panel for new bookmarks
+pref("browser.bookmarks.editDialog.showForNewBookmarks", false);
+
 // Don't try to alter this pref, it'll be reset the next time you use the
 // bookmarking dialog
 pref("browser.bookmarks.editDialog.firstEditField", "namePicker");
diff --git a/application/palemoon/base/content/browser-places.js b/application/palemoon/base/content/browser-places.js
index e5287bb3a4..d18f6ca776 100644
--- a/application/palemoon/base/content/browser-places.js
+++ b/application/palemoon/base/content/browser-places.js
@@ -14,6 +14,10 @@ var StarUI = {
     return document.getElementById(aID);
   },
 
+  get showForNewBookmarks() {
+    return Services.prefs.getBoolPref("browser.bookmarks.editDialog.showForNewBookmarks", false);
+  },
+
   // Edit-bookmark panel
   get panel() {
     delete this.panel;
@@ -1261,7 +1265,8 @@ var BookmarkingUI = {
     }
     // Ignore clicks on the star if we are updating its state.
     if (!this._pendingStmt) {
-      PlacesCommandHook.bookmarkCurrentPage(this._itemIds.length > 0);
+      PlacesCommandHook.bookmarkCurrentPage(this._itemIds.length > 0 ||
+                                            StarUI.showForNewBookmarks);
     }
   },