diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index bd39bc10..bb23004f 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -186,6 +186,12 @@ const Inner = () => {
     }
   }, [serverEditScreen])
 
+  useDidUpdateEffect(() => {
+    if (!isEditScreenModal) {
+      setServerEditScreen(null)
+    }
+  }, [isEditScreenModal])
+
   if (isEditScreenModal) {
     return <AddServerOrConnect
       defaults={{