diff --git a/aqt/browser.py b/aqt/browser.py
index c36586286..0e02b781a 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -444,7 +444,6 @@ class Browser(QMainWindow):
         f.actionOrange_Flag.triggered.connect(lambda: self.onSetFlag(2))
         f.actionGreen_Flag.triggered.connect(lambda: self.onSetFlag(3))
         f.actionBlue_Flag.triggered.connect(lambda: self.onSetFlag(4))
-        f.actionClear_Flag.triggered.connect(lambda: self.onSetFlag(0))
         # jumps
         f.actionPreviousCard.triggered.connect(self.onPreviousCard)
         f.actionNextCard.triggered.connect(self.onNextCard)
@@ -1556,6 +1555,9 @@ update cards set usn=?, mod=?, did=? where id in """ + scids,
     ######################################################################
 
     def onSetFlag(self, n):
+        # flag needs toggling off?
+        if n == self.card.userFlag():
+            n = 0
         self.col.setUserFlag(n, self.selectedCards())
         self.model.reset()
 
diff --git a/designer/browser.ui b/designer/browser.ui
index 625f496a2..63ff76039 100644
--- a/designer/browser.ui
+++ b/designer/browser.ui
@@ -280,8 +280,6 @@
      <addaction name="actionOrange_Flag"/>
      <addaction name="actionGreen_Flag"/>
      <addaction name="actionBlue_Flag"/>
-     <addaction name="separator"/>
-     <addaction name="actionClear_Flag"/>
     </widget>
     <addaction name="actionChange_Deck"/>
     <addaction name="separator"/>
@@ -527,14 +525,6 @@
     <string>Ctrl+D</string>
    </property>
   </action>
-  <action name="actionClear_Flag">
-   <property name="text">
-    <string>Clear Flag</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+0</string>
-   </property>
-  </action>
   <action name="actionRed_Flag">
    <property name="text">
     <string>Red Flag</string>