diff --git a/ui/projects/streampipes/shared-ui/src/lib/dialog/base-dialog/base-dialog.service.ts b/ui/projects/streampipes/shared-ui/src/lib/dialog/base-dialog/base-dialog.service.ts
index f7e38cea61..5c29a16d2a 100644
--- a/ui/projects/streampipes/shared-ui/src/lib/dialog/base-dialog/base-dialog.service.ts
+++ b/ui/projects/streampipes/shared-ui/src/lib/dialog/base-dialog/base-dialog.service.ts
@@ -102,8 +102,12 @@ export class DialogService {
                 overlayRef.dispose();
             }
         });
+
         if (!config.disableClose) {
-            overlayRef.backdropClick().subscribe(() => overlayRef.dispose());
+            overlayRef.backdropClick().subscribe(() => {
+                panelDialogComponentRef.instance.close();
+                overlayRef.dispose();
+            });
         }
     }