diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
index 7084e75dac..da971b9fa6 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
@@ -28,6 +28,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import org.tianocore.ModuleTypeDef;
 import org.tianocore.MsaHeaderDocument;
 import org.tianocore.SpdHeaderDocument;
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;
@@ -593,6 +594,7 @@ public class SelectModuleBelong extends IDialog {
             msaHeader.setModuleName(this.jTextFieldName.getText());
             msaHeader.setGuidValue(this.jTextFieldGuid.getText());
             msaHeader.setVersion(this.jTextFieldVersion.getText());
+            msaHeader.setModuleType(ModuleTypeDef.BASE);
 
             msa.setMsaHeader(msaHeader);
         } catch (Exception e) {
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
index a180910a9f..9cf0d380e0 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
@@ -928,6 +928,8 @@ public class MsaHeader extends IInternalFrame {
         }
         if (arg0.getSource() == jButtonGenerateGuid) {
             jTextFieldGuid.setText(Tools.generateUuidString());
+            jTextFieldGuid.requestFocus();
+            jButtonGenerateGuid.requestFocus();
         }
     }