2 files changed, 11 insertions, 3 deletions
diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index d57c777f1d..5001118ab0 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -126,8 +126,7 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
     //
     // Set ToolTipText Show Time
     //
-    static { ToolTipManager.sharedInstance().setDismissDelay(18000);} 
-
+    static { ToolTipManager.sharedInstance().setDismissDelay(18000); }
 
     ///
     /// Used to record current operation target
diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
index a052b74d3e..70342e73cd 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
@@ -477,6 +477,7 @@ public class SelectModuleBelong extends IDialog {
      **/
     public boolean check() {
         String path = this.jTextFieldFilePath.getText();
+        path = Tools.addPathExt(path, mode);
         String guid = this.jTextFieldGuid.getText();
         String version = this.jTextFieldVersion.getText();
         
@@ -512,7 +513,15 @@ public class SelectModuleBelong extends IDialog {
             return false;
         }
         
-
+        //
+        // Check if path is valid
+        //
+        File f = new File(path);
+        if (!f.isFile()) {
+            Log.wrn("New File", "Please type a complete file path!");
+            return false;
+        }
+        f = null;
 
         if (mode == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {
             //