diff --git a/frontend/src/components/ConnectButton.tsx b/frontend/src/components/ConnectButton.tsx
new file mode 100644
index 00000000..fc5537da
--- /dev/null
+++ b/frontend/src/components/ConnectButton.tsx
@@ -0,0 +1,25 @@
+import Loading from "src/components/Loading";
+
+type ConnectButtonProps = {
+  isConnecting: boolean;
+};
+
+export default function ConnectButton({ isConnecting }: ConnectButtonProps) {
+  return (
+    <button
+      type="submit"
+      className={`mt-4 inline-flex w-full gap-2 ${
+        isConnecting ? "bg-gray-300 dark:bg-gray-700" : "bg-purple-700"
+      } cursor-pointer items-center justify-center rounded-md px-5 py-3 font-medium text-white shadow transition duration-150 hover:bg-purple-900 focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 dark:text-neutral-200`}
+      disabled={isConnecting}
+    >
+      {isConnecting ? (
+        <>
+          <Loading /> Connecting...
+        </>
+      ) : (
+        <>Connect</>
+      )}
+    </button>
+  );
+}
diff --git a/frontend/src/screens/Setup.tsx b/frontend/src/screens/Setup.tsx
index 1807a0f0..243ad4cd 100644
--- a/frontend/src/screens/Setup.tsx
+++ b/frontend/src/screens/Setup.tsx
@@ -32,7 +32,7 @@ export function Setup() {
         }),
       });
 
-      navigate("/apps");
+      navigate("/");
     } catch (error) {
       handleRequestError("Failed to connect", error);
     } finally {