diff --git a/web/app/_components/InputToolbar/index.tsx b/web/app/_components/InputToolbar/index.tsx
index 6be6272f8..c0d23edc0 100644
--- a/web/app/_components/InputToolbar/index.tsx
+++ b/web/app/_components/InputToolbar/index.tsx
@@ -20,10 +20,10 @@ import { userConversationsAtom } from '@helpers/atoms/Conversation.atom'
 const InputToolbar: React.FC = () => {
   const activeModel = useAtomValue(activeAssistantModelAtom)
   const currentConvoState = useAtomValue(currentConvoStateAtom)
-  const conversations = useAtomValue(userConversationsAtom)
   const { inputState, currentConvo } = useGetInputState()
   const { requestCreateConvo } = useCreateConversation()
   const { startModel } = useStartStopModel()
+  const conversations = useAtomValue(userConversationsAtom)
 
   const activeConvoId = useAtomValue(getActiveConvoIdAtom)
 
diff --git a/web/helpers/ModalWrapper.tsx b/web/helpers/ModalWrapper.tsx
index 0338debe6..a9c799c89 100644
--- a/web/helpers/ModalWrapper.tsx
+++ b/web/helpers/ModalWrapper.tsx
@@ -5,8 +5,8 @@ import ConfirmDeleteConversationModal from '@/_components/ConfirmDeleteConversat
 import ConfirmDeleteModelModal from '@/_components/ConfirmDeleteModelModal'
 import ConfirmSignOutModal from '@/_components/ConfirmSignOutModal'
 import MobileMenuPane from '@/_components/MobileMenuPane'
-import ModalNoActiveModel from '@/_components/ModalNoActiveModel'
 import SwitchingModelConfirmationModal from '@/_components/SwitchingModelConfirmationModal'
+import ModalNoActiveModel from '@/_components/ModalNoActiveModel'
 import { ReactNode } from 'react'
 
 type Props = {
@@ -23,6 +23,7 @@ export const ModalWrapper: React.FC<Props> = ({ children }) => (
     <SwitchingModelConfirmationModal />
     <ModalNoActiveModel />
     <SwitchingModelConfirmationModal />
+    <ModalNoActiveModel />
     {children}
   </>
 )