diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
index ddf229651..6a5a07a40 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
@@ -195,6 +195,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent implements Se
          * (controller Id, name & description) and action buttons layout
          */
         addStyleName("lay-color");
+        setSizeUndefined();
 
         final FormLayout formLayout = new FormLayout();
         formLayout.addComponent(mandatoryLabel);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
index 3d1caa6e7..c9afddebf 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
@@ -123,7 +123,7 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
          * The main layout of the window contains mandatory info, textboxes
          * (controller Id, name & description) and action buttons layout
          */
-
+        setSizeUndefined();
         formLayout = new FormLayout();
         formLayout.addComponent(madatoryLabel);
         formLayout.addComponent(controllerIDTextField);