diff --git a/aqt/browser.py b/aqt/browser.py
index 0e02b781a..2607057fe 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -654,6 +654,7 @@ class Browser(QMainWindow):
             self.focusTo = None
             self.editor.card = self.card
             self.singleCard = True
+        self._updateFlagsMenu()
         runHook("browser.rowChanged", self)
         self._renderPreview(True)
 
@@ -1561,6 +1562,19 @@ update cards set usn=?, mod=?, did=? where id in """ + scids,
         self.col.setUserFlag(n, self.selectedCards())
         self.model.reset()
 
+    def _updateFlagsMenu(self):
+        flag = self.card and self.card.userFlag()
+        flag = flag or 0
+
+        f = self.form
+        flagActions = [f.actionRed_Flag,
+                       f.actionOrange_Flag,
+                       f.actionGreen_Flag,
+                       f.actionBlue_Flag]
+
+        for c, act in enumerate(flagActions):
+            act.setChecked(flag == c+1)
+
     def onMark(self, mark=None):
         if mark is None:
             mark = not self.isMarked()
diff --git a/designer/browser.ui b/designer/browser.ui
index 63ff76039..e4f82c91d 100644
--- a/designer/browser.ui
+++ b/designer/browser.ui
@@ -526,6 +526,9 @@
    </property>
   </action>
   <action name="actionRed_Flag">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Red Flag</string>
    </property>
@@ -534,6 +537,9 @@
    </property>
   </action>
   <action name="actionOrange_Flag">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Orange Flag</string>
    </property>
@@ -542,6 +548,9 @@
    </property>
   </action>
   <action name="actionGreen_Flag">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Green Flag</string>
    </property>
@@ -550,6 +559,9 @@
    </property>
   </action>
   <action name="actionBlue_Flag">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Blue Flag</string>
    </property>