diff --git a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/ConfigMenu.tsx b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/ConfigMenu.tsx
index 730bdfc44d60..d9e98fbe4e72 100644
--- a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/ConfigMenu.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/ConfigMenu.tsx
@@ -56,7 +56,10 @@ export const ConfigMenu: React.FC<ConfigMenuProps> = ({ className, configJsonErr
               size="sm"
               variant="secondary"
               onClick={() => setIsOpen(true)}
-              disabled={!jsonManifest.spec}
+              disabled={
+                !jsonManifest.spec ||
+                Object.keys(jsonManifest.spec.connection_specification.properties || {}).length === 0
+              }
               icon={<FontAwesomeIcon className={styles.icon} icon={faUser} />}
             >
               <FormattedMessage id="connectorBuilder.inputsButton" />
diff --git a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestingPanel.module.scss b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestingPanel.module.scss
index fa2474e5efbf..cee48821b1af 100644
--- a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestingPanel.module.scss
+++ b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestingPanel.module.scss
@@ -37,6 +37,9 @@ $buttonHeight: 36px;
   gap: variables.$spacing-md;
   background-color: colors.$blue-50;
   border-radius: variables.$border-radius-sm;
+
+  // leave room for config button
+  margin-top: 50px;
 }
 
 .loadingSpinner {
diff --git a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestingPanel.tsx b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestingPanel.tsx
index 6ac005ae807a..b3bff5d70d38 100644
--- a/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestingPanel.tsx
+++ b/airbyte-webapp/src/components/connectorBuilder/StreamTestingPanel/StreamTestingPanel.tsx
@@ -55,6 +55,12 @@ export const StreamTestingPanel: React.FC<unknown> = () => {
 
   return (
     <div className={styles.container}>
+      <ConfigMenu
+        className={styles.configButton}
+        configJsonErrors={configJsonErrors}
+        isOpen={isTestInputOpen}
+        setIsOpen={setTestInputOpen}
+      />
       {!hasStreams && (
         <div className={styles.addStreamMessage}>
           <Heading as="h2" className={styles.addStreamHeading}>
@@ -64,18 +70,10 @@ export const StreamTestingPanel: React.FC<unknown> = () => {
         </div>
       )}
       {hasStreams && streamListErrorMessage === undefined && (
-        <>
-          <ConfigMenu
-            className={styles.configButton}
-            configJsonErrors={configJsonErrors}
-            isOpen={isTestInputOpen}
-            setIsOpen={setTestInputOpen}
-          />
-          <div className={styles.selectAndTestContainer}>
-            <StreamSelector className={styles.streamSelector} />
-            <StreamTester hasConfigJsonErrors={configJsonErrors > 0} setTestInputOpen={setTestInputOpen} />
-          </div>
-        </>
+        <div className={styles.selectAndTestContainer}>
+          <StreamSelector className={styles.streamSelector} />
+          <StreamTester hasConfigJsonErrors={configJsonErrors > 0} setTestInputOpen={setTestInputOpen} />
+        </div>
       )}
       {hasStreams && streamListErrorMessage !== undefined && (
         <div className={styles.listErrorDisplay}>