diff --git a/webapp/packages/core-ui/src/Screens/AppScreen/OptionsPanelService.ts b/webapp/packages/core-ui/src/Screens/AppScreen/OptionsPanelService.ts
index 1c44a29f45..4e4be2b0e3 100644
--- a/webapp/packages/core-ui/src/Screens/AppScreen/OptionsPanelService.ts
+++ b/webapp/packages/core-ui/src/Screens/AppScreen/OptionsPanelService.ts
@@ -36,7 +36,11 @@ export class OptionsPanelService {
   }
 
   async open(component: () => React.FC): Promise<void> {
-    if (!(await this.close(component))) {
+    if (component === this.panelComponent) {
+      return;
+    }
+
+    if (!(await this.close())) {
       return;
     }
 
@@ -44,8 +48,8 @@ export class OptionsPanelService {
     this.active = true;
   }
 
-  async close(component: () => React.FC): Promise<boolean> {
-    if (component !== this.panelComponent || this.panelComponent === null) {
+  async close(): Promise<boolean> {
+    if (this.panelComponent === null) {
       return true;
     }
 
diff --git a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts
index f9de931161..2a28f99060 100644
--- a/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts
+++ b/webapp/packages/plugin-connections/src/PublicConnectionForm/PublicConnectionFormService.ts
@@ -30,6 +30,6 @@ export class PublicConnectionFormService {
 
   async close(): Promise<void> {
     this.connectionId = null;
-    await this.optionsPanelService.close(formGetter);
+    await this.optionsPanelService.close();
   }
 }