diff --git a/frontend/widgets/src/QueryApi.Dashboard.jsx b/frontend/widgets/src/QueryApi.Dashboard.jsx
index 5cf01250..28afcced 100644
--- a/frontend/widgets/src/QueryApi.Dashboard.jsx
+++ b/frontend/widgets/src/QueryApi.Dashboard.jsx
@@ -33,6 +33,11 @@ const TabsButton = styled.button`
   &:hover {
     background: #e0e0e0;
   }
+
+  &:disabled {
+    color: #999;
+    cursor: not-allowed;
+  }
 `;
 
 const IS_DEV = `${REPL_EXTERNAL_APP_URL}` === "https://queryapi-frontend-vcqilefdcq-ew.a.run.app" || `${REPL_EXTERNAL_APP_URL}` === "http://localhost:3000";
@@ -72,13 +77,16 @@ return (
         Explore Indexers
       </TabsButton>
 
-      <TabsButton
+      {<TabsButton
         type="button"
         onClick={() => selectTab("indexer")}
         selected={activeTab === "indexer"}
+        disabled={!selectedIndexer}
       >
-        Indexer ({selectedIndexer})
-      </TabsButton>
+        {!selectedIndexer
+          ? (activeTab !== "create-new-indexer" ? "Select an Indexer" : "Indexer Creation")
+          : `Indexer (${selectedIndexer})`}
+      </TabsButton>}
     </Tabs>