diff --git a/mail/base/content/mail3PaneWindowCommands.js b/mail/base/content/mail3PaneWindowCommands.js
index 6d67fc571ce..ccdff20f935 100644
--- a/mail/base/content/mail3PaneWindowCommands.js
+++ b/mail/base/content/mail3PaneWindowCommands.js
@@ -229,6 +229,7 @@ var DefaultController =
       case "cmd_selectAll":
       case "cmd_selectThread":
       case "cmd_moveToFolderAgain":
+      case "cmd_selectFlagged":
         return true;
       case "cmd_downloadFlagged":
       case "cmd_downloadSelected":
@@ -375,6 +376,7 @@ var DefaultController =
       case "cmd_search":
         return IsCanSearchMessagesEnabled();
       case "cmd_selectAll":
+      case "cmd_selectFlagged":
         return gDBView != null;
       // these are enabled on when we are in threaded mode
       case "cmd_selectThread":
@@ -699,6 +701,9 @@ var DefaultController =
       case "cmd_selectThread":
           gDBView.doCommand(nsMsgViewCommandType.selectThread);
           break;
+      case "cmd_selectFlagged":
+        gDBView.doCommand(nsMsgViewCommandType.selectFlagged);
+        break;
     }
   },
 
diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index af57527a4c8..b9ed531f470 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1003,6 +1003,10 @@
              accesskey="&selectThreadCmd.accesskey;"
              key="key_selectThread"
              command="cmd_selectThread"/>
+            <menuitem id="menu_selectFlagged"
+                      label="&selectFlaggedCmd.label;"
+                      accesskey="&selectFlaggedCmd.accesskey;"
+                      command="cmd_selectFlagged"/>
           </menupopup>
         </menu>
         <menuseparator id="editMenuAfterSelectSeparator"/>