diff --git a/web/app/_components/InputToolbar/index.tsx b/web/app/_components/InputToolbar/index.tsx
index a150826a1..6be6272f8 100644
--- a/web/app/_components/InputToolbar/index.tsx
+++ b/web/app/_components/InputToolbar/index.tsx
@@ -20,12 +20,11 @@ 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)
 
   const onNewConversationClick = () => {
diff --git a/web/helpers/ModalWrapper.tsx b/web/helpers/ModalWrapper.tsx
index d5cb05971..0338debe6 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 SwitchingModelConfirmationModal from '@/_components/SwitchingModelConfirmationModal'
 import ModalNoActiveModel from '@/_components/ModalNoActiveModel'
+import SwitchingModelConfirmationModal from '@/_components/SwitchingModelConfirmationModal'
 import { ReactNode } from 'react'
 
 type Props = {
@@ -22,6 +22,7 @@ export const ModalWrapper: React.FC<Props> = ({ children }) => (
     <BotListModal />
     <SwitchingModelConfirmationModal />
     <ModalNoActiveModel />
+    <SwitchingModelConfirmationModal />
     {children}
   </>
 )