diff --git a/packages/desktop-client/src/components/ManageRules.js b/packages/desktop-client/src/components/ManageRules.js
index 8b93bff0b1ed6014087a55d211e6b3308993182c..93e843c1d34999b3192c1cbaf452b4598ff86a53 100644
--- a/packages/desktop-client/src/components/ManageRules.js
+++ b/packages/desktop-client/src/components/ManageRules.js
@@ -588,20 +588,29 @@ export default function ManageRules({
   }, []);
 
   function onCreateRule() {
+    let rule = {
+      stage: null,
+      conditions: [
+        {
+          field: 'payee',
+          op: 'is',
+          value: payeeId || null,
+          type: 'id'
+        }
+      ],
+      actions: [
+        {
+          op: 'set',
+          field: 'category',
+          value: null,
+          type: 'id'
+        }
+      ]
+    };
+
     dispatch(
       pushModal('edit-rule', {
-        rule: {
-          stage: null,
-          conditions: [{ op: 'is', field: 'payee', value: null, type: 'id' }],
-          actions: [
-            {
-              op: 'set',
-              field: 'category',
-              value: null,
-              type: 'id'
-            }
-          ]
-        },
+        rule,
         onSave: async newRule => {
           let newRules = await loadRules();
 
diff --git a/packages/desktop-client/src/components/payees/ManagePayeesWithData.js b/packages/desktop-client/src/components/payees/ManagePayeesWithData.js
index 8d2f05e1989ffece130afbf673f1be18ddf32edf..fa44a492fb5b24d50e5c43640b080f5c13ed97af 100644
--- a/packages/desktop-client/src/components/payees/ManagePayeesWithData.js
+++ b/packages/desktop-client/src/components/payees/ManagePayeesWithData.js
@@ -90,19 +90,24 @@ function ManagePayeesWithData({
   }
 
   function onCreateRule(id) {
-    let payee = payees.find(p => p.id === id);
     let rule = {
-      id: null,
       stage: null,
       conditions: [
         {
-          field: 'description',
+          field: 'payee',
           op: 'is',
-          value: payee.id,
+          value: id,
           type: 'id'
         }
       ],
-      actions: []
+      actions: [
+        {
+          op: 'set',
+          field: 'category',
+          value: null,
+          type: 'id'
+        }
+      ]
     };
     pushModal('edit-rule', { rule });
   }