diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
index 23378ccbb4..8584657c91 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
@@ -206,7 +206,12 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
                     }
                     else{
                         int selectedRow = lsm.getMinSelectionIndex();
-                        
+                        jTextFieldDefaultValue.setText("");
+                        jTextFieldVpdOffset.setText("");
+                        jTextFieldVarName.setText("");
+                        jTextFieldVarGuid.setText("");
+                        jTextFieldVarOffset.setText("");
+                        jTextFieldHiiDefaultValue.setText("");
                         displayDetails(selectedRow);
                     }
                 }