1 files changed, 3 insertions, 2 deletions
diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index b97e0d77e6..e6df69ef10 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -157,13 +157,14 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         classInstanceMap = null;
         classProduced = null;
         classConsumed = null;
-        jTabbedPane.setSelectedIndex(0);
+        int tabIndex = jTabbedPane.indexOfTab("FV Info");
+        jTabbedPane.setSelectedIndex(tabIndex);
         initPcdBuildDefinition(moduleKey);
         moduleId = WorkspaceProfile.getModuleId(moduleKey);
         if (moduleId == null) {
             return;
         }
-        int tabIndex = jTabbedPane.indexOfTab("Libraries");
+        tabIndex = jTabbedPane.indexOfTab("Libraries");
         if (moduleId.isLibrary()) {
             jTabbedPane.setEnabledAt(tabIndex, false);
         }