diff --git a/mozilla/browser/components/places/content/controller.js b/mozilla/browser/components/places/content/controller.js
index b8632ae9a3a..798ccfeeeea 100755
--- a/mozilla/browser/components/places/content/controller.js
+++ b/mozilla/browser/components/places/content/controller.js
@@ -278,7 +278,10 @@ PlacesController.prototype = {
     var nodes = this._view.getSelectionNodes();
     var root = this._view.getResultNode();
 
+    var bmFolderId = PlacesUtils.bookmarksMenuFolderId;
+    var ubFolderId = PlacesUtils.unfiledBookmarksFolderId;
     var btFolderId = PlacesUtils.toolbarFolderId;
+    
     for (var i = 0; i < nodes.length; ++i) {
       // Disallow removing the view's root node 
       if (nodes[i] == root)
@@ -286,7 +289,10 @@ PlacesController.prototype = {
 
       // Disallow removing the toolbar folder
       if (!aIsMoveCommand &&
-          PlacesUtils.nodeIsFolder(nodes[i]) && nodes[i].itemId == btFolderId)
+          PlacesUtils.nodeIsFolder(nodes[i]) && 
+          (nodes[i].itemId == btFolderId || 
+            nodes[i].itemId == ubFolderId ||
+            nodes[i].itemId == bmFolderId))
         return false;
 
       // We don't call nodeIsReadOnly here, because nodeIsReadOnly means that