diff --git a/app/src/app.tsx b/app/src/app.tsx
index fd20bee8..c44049c9 100644
--- a/app/src/app.tsx
+++ b/app/src/app.tsx
@@ -1,32 +1,13 @@
 import { useState } from 'react'
 import copy from 'copy-to-clipboard'
-import { exec as cbExec } from 'child_process'
-import * as path from 'path'
-import * as fs from 'fs'
 import { DocumentDuplicateIcon } from '@heroicons/react/24/outline'
-import { app } from '@electron/remote'
+import Store from 'electron-store'
+import { getCurrentWindow } from '@electron/remote'
+
+import { install } from './install'
 import OllamaIcon from './ollama.svg'
-import { promisify } from 'util'
 
-const ollama = app.isPackaged ? path.join(process.resourcesPath, 'ollama') : path.resolve(process.cwd(), '..', 'ollama')
-const exec = promisify(cbExec)
-
-async function installCLI() {
-  const symlinkPath = '/usr/local/bin/ollama'
-
-  if (fs.existsSync(symlinkPath) && fs.readlinkSync(symlinkPath) === ollama) {
-    return
-  }
-
-  const command = `do shell script "ln -F -s ${ollama} /usr/local/bin/ollama" with administrator privileges`
-
-  try {
-    await exec(`osascript -e '${command}'`)
-  } catch (error) {
-    console.error(`cli: failed to install cli: ${error.message}`)
-    return
-  }
-}
+const store = new Store()
 
 enum Step {
   WELCOME = 0,
@@ -40,7 +21,7 @@ export default function () {
   const command = 'ollama run orca'
 
   return (
-    <div className='drag mx-auto flex min-h-screen w-full flex-col justify-between bg-white px-4 pt-16'>
+    <div className='mx-auto flex min-h-screen w-full flex-col justify-between bg-white px-4 pt-16'>
       {step === Step.WELCOME && (
         <>
           <div className='mx-auto text-center'>
@@ -49,9 +30,7 @@ export default function () {
               Let's get you up and running with your own large language models.
             </p>
             <button
-              onClick={() => {
-                setStep(1)
-              }}
+              onClick={() => setStep(Step.CLI)}
               className='rounded-dm mx-auto my-8 w-[40%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
             >
               Next
@@ -70,9 +49,10 @@ export default function () {
             <div className='mx-auto'>
               <button
                 onClick={async () => {
-                  await installCLI()
-                  window.focus()
-                  setStep(2)
+                  await install()
+                  getCurrentWindow().show()
+                  getCurrentWindow().focus()
+                  setStep(Step.FINISH)
                 }}
                 className='rounded-dm mx-auto w-[60%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
               >
@@ -107,6 +87,7 @@ export default function () {
             </div>
             <button
               onClick={() => {
+                store.set('first-time-run', true)
                 window.close()
               }}
               className='rounded-dm mx-auto w-[60%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
diff --git a/app/src/index.ts b/app/src/index.ts
index 3d2df8c8..57410e40 100644
--- a/app/src/index.ts
+++ b/app/src/index.ts
@@ -6,6 +6,7 @@ import 'winston-daily-rotate-file'
 import * as path from 'path'
 
 import { analytics, id } from './telemetry'
+import { installed, install } from './install'
 
 require('@electron/remote/main').initialize()
 
@@ -40,12 +41,13 @@ function firstRunWindow() {
     frame: false,
     fullscreenable: false,
     resizable: false,
-    movable: false,
-    transparent: true,
+    movable: true,
+    show: false,
     webPreferences: {
       nodeIntegration: true,
       contextIsolation: false,
     },
+    alwaysOnTop: true,
   })
 
   require('@electron/remote/main').enable(welcomeWindow.webContents)
@@ -53,6 +55,8 @@ function firstRunWindow() {
   // and load the index.html of the app.
   welcomeWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY)
 
+  welcomeWindow.on('ready-to-show', () => welcomeWindow.show())
+
   // for debugging
   // welcomeWindow.webContents.openDevTools()
 
@@ -151,15 +155,15 @@ app.on('ready', () => {
   createSystemtray()
   server()
 
-  if (!store.has('first-time-run')) {
-    // This is the first run
-    app.setLoginItemSettings({ openAtLogin: true })
-    firstRunWindow()
-    store.set('first-time-run', true)
-  } else {
-    // The app has been run before
+  if (store.get('first-time-run') && installed()) {
     app.setLoginItemSettings({ openAtLogin: app.getLoginItemSettings().openAtLogin })
+    return
   }
+
+  // This is the first run or the CLI is no longer installed
+  app.setLoginItemSettings({ openAtLogin: true })
+
+  firstRunWindow()
 })
 
 // Quit when all windows are closed, except on macOS. There, it's common
diff --git a/app/src/install.ts b/app/src/install.ts
new file mode 100644
index 00000000..c08aff59
--- /dev/null
+++ b/app/src/install.ts
@@ -0,0 +1,24 @@
+import * as fs from 'fs'
+import { exec as cbExec } from 'child_process'
+import * as path from 'path'
+import { promisify } from 'util'
+
+const app = process && process.type === 'renderer' ? require('@electron/remote').app : require('electron').app
+const ollama = app.isPackaged ? path.join(process.resourcesPath, 'ollama') : path.resolve(process.cwd(), '..', 'ollama')
+const exec = promisify(cbExec)
+const symlinkPath = '/usr/local/bin/ollama'
+
+export function installed() {
+  return fs.existsSync(symlinkPath) && fs.readlinkSync(symlinkPath) === ollama
+}
+
+export async function install() {
+  const command = `do shell script "ln -F -s ${ollama} ${symlinkPath}" with administrator privileges`
+
+  try {
+    await exec(`osascript -e '${command}'`)
+  } catch (error) {
+    console.error(`cli: failed to install cli: ${error.message}`)
+    return
+  }
+}