diff --git a/src/common/SurgeSynthesizerIO.cpp b/src/common/SurgeSynthesizerIO.cpp
index 9a83f9df5eb..ba9b1419e69 100644
--- a/src/common/SurgeSynthesizerIO.cpp
+++ b/src/common/SurgeSynthesizerIO.cpp
@@ -590,6 +590,17 @@ void SurgeSynthesizer::savePatchToPath(fs::path filename)
     // refresh list
     storage.refresh_patchlist();
     storage.initializePatchDb(true);
+
+    int idx = 0;
+    for (auto p : storage.patch_list)
+    {
+        if (p.path == filename)
+        {
+            patchid = idx;
+            current_category_id = p.category;
+        }
+        idx++;
+    }
     refresh_editor = true;
     midiprogramshavechanged = true;
 }