diff --git a/frontend/widgets/src/QueryApi.Dashboard.jsx b/frontend/widgets/src/QueryApi.Dashboard.jsx
index 0defa657..459c8f6b 100644
--- a/frontend/widgets/src/QueryApi.Dashboard.jsx
+++ b/frontend/widgets/src/QueryApi.Dashboard.jsx
@@ -80,16 +80,20 @@ return (
         Explore Indexers
       </TabsButton>
 
-      {<TabsButton
+      <TabsButton
         type="button"
         onClick={() => selectTab("indexer")}
         selected={activeTab === "indexer"}
         disabled={!selectedIndexer}
       >
-        {!selectedIndexer
-          ? (activeTab !== "create-new-indexer" ? "Select an Indexer" : "Indexer Creation")
-          : `Indexer (${selectedIndexer})`}
-      </TabsButton>}
+        {(!selectedIndexer && activeTab === "create-new-indexer")
+          ? "Indexer Creation"
+          : (!selectedIndexer && activeTab === "launch-new-indexer")
+            ? "Indexer Creation (Launchpad)"
+            : (!selectedIndexer)
+              ? "Select an Indexer"
+              : `Indexer (${selectedIndexer})`}
+      </TabsButton>
     </Tabs>
 
 
@@ -114,7 +118,7 @@ return (
         </Section>
       )}
 
-      {activeTab === "create-new-indexer" && (
+      {activeTab === 'launch-new-indexer' && (
         <Section>
           <Widget
             src={`${REPL_ACCOUNT_ID}/widget/QueryApi.Editor`}
@@ -122,27 +126,27 @@ return (
               indexerName: selectedIndexer ? selectedIndexer.split('/')[1] : '',
               accountId: selectedIndexer ? selectedIndexer.split('/')[0] : '',
               path: "create-new-indexer",
+              indexerWizardCode: indexerWizardCode,
+              schemaWizardCode: schemaWizardCode,
             }}
           />
         </Section>
       )}
 
-      {activeTab === 'indexer' && (
+      {activeTab === "create-new-indexer" && (
         <Section>
           <Widget
             src={`${REPL_ACCOUNT_ID}/widget/QueryApi.Editor`}
             props={{
               indexerName: selectedIndexer ? selectedIndexer.split('/')[1] : '',
               accountId: selectedIndexer ? selectedIndexer.split('/')[0] : '',
-              path: "query-api-editor",
-              tab: props.tab,
-              activeView: activeIndexerTabView
+              path: "create-new-indexer",
             }}
           />
         </Section>
       )}
 
-      {activeTab === 'launch-new-indexer' && (
+      {activeTab === 'indexer' && (
         <Section>
           <Widget
             src={`${REPL_ACCOUNT_ID}/widget/QueryApi.Editor`}
@@ -151,14 +155,13 @@ return (
               accountId: selectedIndexer ? selectedIndexer.split('/')[0] : '',
               path: "query-api-editor",
               tab: props.tab,
-              activeView: activeIndexerTabView,
-              indexerWizardCode: indexerWizardCode,
-              schemaWizardCode: schemaWizardCode,
+              activeView: activeIndexerTabView
             }}
           />
         </Section>
       )}
 
+
       {!['launchpad', 'explore', 'indexer', 'create-new-indexer', 'launch-new-indexer'].includes(activeTab) && (
         <Widget
           src={`${REPL_ACCOUNT_ID}/widget/QueryApi.NotFound`}