diff --git a/src/gui/Popups/PushRuleSettingsPopup/GeneralRule.qml b/src/gui/Popups/PushRuleSettingsPopup/GeneralRule.qml
index fcc82b5e..32e7bfd3 100644
--- a/src/gui/Popups/PushRuleSettingsPopup/GeneralRule.qml
+++ b/src/gui/Popups/PushRuleSettingsPopup/GeneralRule.qml
@@ -30,7 +30,6 @@ HColumnLayout {
             id: idField
             width: parent.width
             defaultText: rule.rule_id
-            // TODO: minimum length, check no dupe
         }
     }
 
diff --git a/src/gui/Popups/PushRuleSettingsPopup/PushRuleSettingsPopup.qml b/src/gui/Popups/PushRuleSettingsPopup/PushRuleSettingsPopup.qml
index 5d1534b1..dc5800bd 100644
--- a/src/gui/Popups/PushRuleSettingsPopup/PushRuleSettingsPopup.qml
+++ b/src/gui/Popups/PushRuleSettingsPopup/PushRuleSettingsPopup.qml
@@ -79,7 +79,7 @@ HFlickableColumnPopup {
     page.footer: AutoDirectionLayout {
         ApplyButton {
             text: qsTr("Save changes")
-            enabled: true  // TODO
+            enabled: swipeView.currentItem.idField.text.trim() !== ""
             loading: saveFutureId !== ""
             onClicked: root.save()
         }