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 85b55d69d..7fe8e25de 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
@@ -92,6 +92,8 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent implements Se
 
     private Long baseSwModuleId;
 
+    private FormLayout formLayout;
+
     /**
      * Create window for new software module.
      * 
@@ -207,7 +209,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent implements Se
          */
         addStyleName("lay-color");
 
-        final FormLayout formLayout = new FormLayout();
+        formLayout = new FormLayout();
         formLayout.setCaption(null);
         formLayout.addComponent(typeComboBox);
         formLayout.addComponent(nameTextField);
@@ -369,4 +371,8 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent implements Se
         return !(event.getText().equals(oldVendorValue) && descTextArea.getValue().equals(oldDescriptionValue));
     }
 
+    public FormLayout getFormLayout() {
+        return formLayout;
+    }
+
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
index 754f61ed2..d3153ee9a 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
@@ -14,8 +14,11 @@ import java.io.Serializable;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.hawkbit.ui.artifacts.smtable.SoftwareModuleAddUpdateWindow;
 import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
 import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleBorderWithIcon;
+import org.eclipse.hawkbit.ui.layouts.AbstractCreateUpdateTagLayout;
+import org.eclipse.hawkbit.ui.management.targettable.TargetAddUpdateWindowLayout;
 import org.eclipse.hawkbit.ui.utils.I18N;
 import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
 import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
@@ -224,9 +227,18 @@ public class CommonDialogWindow extends Window implements Serializable {
         if (existsMandatoryFieldsInWindowContent()) {
             // final Label madatoryLabel = new
             // Label(i18n.get("label.mandatory.field"));
-            final Label madatoryLabel = new Label("* Mandatory Field");
-            madatoryLabel.addStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_ERROR + " " + ValoTheme.LABEL_TINY);
-            mainLayout.addComponent(madatoryLabel);
+            final Label mandatoryLabel = new Label("* Mandatory Field");
+            mandatoryLabel.addStyleName(SPUIStyleDefinitions.SP_TEXTFIELD_ERROR + " " + ValoTheme.LABEL_TINY);
+
+            if (content instanceof TargetAddUpdateWindowLayout) {
+                ((TargetAddUpdateWindowLayout) content).getFormLayout().addComponent(mandatoryLabel);
+            } else if (content instanceof SoftwareModuleAddUpdateWindow) {
+                ((SoftwareModuleAddUpdateWindow) content).getFormLayout().addComponent(mandatoryLabel);
+            } else if (content instanceof AbstractCreateUpdateTagLayout) {
+                ((AbstractCreateUpdateTagLayout) content).getMainLayout().addComponent(mandatoryLabel);
+            }
+
+            mainLayout.addComponent(mandatoryLabel);
         }
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
index f8fb5c3e0..85847ccc5 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
@@ -690,4 +690,8 @@ public abstract class AbstractCreateUpdateTagLayout extends CustomComponent
         this.tagDescOriginal = tagDescOriginal;
     }
 
+    public GridLayout getMainLayout() {
+        return mainLayout;
+    }
+
 }
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 e5d65295b..287df14b3 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
@@ -334,4 +334,8 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
         window.addStyleName("target-update-window");
     }
 
+    public FormLayout getFormLayout() {
+        return formLayout;
+    }
+
 }