diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/WindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/WindowBuilder.java
index 9c0e927fe..113c33e3d 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/WindowBuilder.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/WindowBuilder.java
@@ -190,6 +190,11 @@ public class WindowBuilder {
         window.setResizable(false);
 
         decorateWindow(window);
+
+        if (SPUIDefinitions.CREATE_UPDATE_WINDOW.equals(type)) {
+            window.setClosable(false);
+        }
+
         return window;
     }
 }