diff --git a/src/style.css b/src/style.css
index bbc20df..36b2b01 100644
--- a/src/style.css
+++ b/src/style.css
@@ -15,6 +15,9 @@
 .model_list_box {
 	padding: 0;
 }
+.manage_models_button {
+  padding: 6px 8px 6px 8px;
+}
 .model_list_box > * {
 	margin: 0;
 }
diff --git a/src/window.py b/src/window.py
index e38b34c..462ca2b 100644
--- a/src/window.py
+++ b/src/window.py
@@ -1287,6 +1287,7 @@ Generate a title following these rules:
                         self.chats["order"] = []
                         for chat_name in self.chats["chats"].keys():
                             self.chats["order"].append(chat_name)
+                    self.model_list_box.select_row(self.model_list_box.get_row_at_index(0))
                     if len(self.chats["chats"][self.chats["selected_chat"]]["messages"].keys()) > 0:
                         last_model_used = self.chats["chats"][self.chats["selected_chat"]]["messages"][list(self.chats["chats"][self.chats["selected_chat"]]["messages"].keys())[-1]]["model"]
                         for i, m in enumerate(self.local_models):
@@ -1382,6 +1383,7 @@ Generate a title following these rules:
             menu_model=self.chat_right_click_menu,
             has_arrow=False,
             halign=1,
+            height_request=125
         )
         self.selected_chat_row = chat_row
         position = Gdk.Rectangle()
diff --git a/src/window.ui b/src/window.ui
index 82a6de9..5320f6d 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -99,19 +99,27 @@
                             </style>
                             <property name="popover">
                               <object class="GtkPopover" id="model_popover">
+                                <property name="has-arrow">false</property>
                                 <child>
                                   <object class="GtkBox">
                                     <property name="orientation">1</property>
-                                    <property name="spacing">10</property>
+                                    <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkButton">
+                                        <property name="child">
+                                          <object class="GtkLabel">
+                                            <property name="label" translatable="yes">Manage Models</property>
+                                            <property name="justify">left</property>
+                                            <property name="halign">1</property>
+                                          </object>
+                                        </property>
                                         <property name="hexpand">true</property>
-                                        <property name="label" translatable="yes">Manage Models</property>
                                         <property name="tooltip-text" translatable="yes">Manage Models</property>
                                         <property name="action-name">app.manage_models</property>
                                         <signal name="clicked" handler="close_model_popup"/>
                                         <style>
-                                          <class name="accent"/>
+                                          <class name="flat"/>
+                                          <class name="manage_models_button"/>
                                         </style>
                                       </object>
                                     </child>
@@ -119,15 +127,23 @@
                                       <object class="GtkSeparator"/>
                                     </child>
                                     <child>
-                                      <object class="GtkListBox" id="model_list_box">
-                                        <property name="hexpand">true</property>
-                                        <style>
-                                          <class name="navigation-sidebar"/>
-                                          <class name="model_list_box"/>
-                                        </style>
-                                        <signal name="row-selected" handler="change_model"/>
+                                      <object class="GtkScrolledWindow">
+                                        <property name="max-content-height">300</property>
+                                        <property name="propagate-natural-width">true</property>
+                                        <property name="propagate-natural-height">true</property>
+                                        <child>
+                                          <object class="GtkListBox" id="model_list_box">
+                                            <property name="hexpand">true</property>
+                                            <style>
+                                              <class name="navigation-sidebar"/>
+                                              <class name="model_list_box"/>
+                                            </style>
+                                            <signal name="row-selected" handler="change_model"/>
+                                          </object>
+                                        </child>
                                       </object>
                                     </child>
+
                                   </object>
                                 </child>
                               </object>
@@ -1105,29 +1121,29 @@ By downloading any model you accept their license agreement available on the mod
     </section>
   </menu>
   <menu id="secondary_menu">
-    <item>
-      <attribute name="label" translatable="yes">Delete Chat</attribute>
-      <attribute name="action">app.delete_current_chat</attribute>
-    </item>
-    <item>
-      <attribute name="label" translatable="yes">Rename Chat</attribute>
-      <attribute name="action">app.rename_current_chat</attribute>
-    </item>
-    <item>
-      <attribute name="label" translatable="yes">Export Chat</attribute>
-      <attribute name="action">app.export_current_chat</attribute>
-    </item>
-    <item>
-      <attribute name="label" translatable="yes">Clear Chat</attribute>
-      <attribute name="action">app.clear</attribute>
-    </item>
-  </menu>
-  <menu id="chat_right_click_menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Rename Chat</attribute>
+        <attribute name="action">app.rename_current_chat</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Export Chat</attribute>
+        <attribute name="action">app.export_current_chat</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Clear Chat</attribute>
+        <attribute name="action">app.clear</attribute>
+      </item>
+    </section>
     <section>
       <item>
         <attribute name="label" translatable="yes">Delete Chat</attribute>
-        <attribute name="action">app.delete_chat</attribute>
+        <attribute name="action">app.delete_current_chat</attribute>
       </item>
+    </section>
+  </menu>
+  <menu id="chat_right_click_menu">
+    <section>
       <item>
         <attribute name="label" translatable="yes">Rename Chat</attribute>
         <attribute name="action">app.rename_chat</attribute>
@@ -1137,6 +1153,12 @@ By downloading any model you accept their license agreement available on the mod
         <attribute name="action">app.export_chat</attribute>
       </item>
     </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Delete Chat</attribute>
+        <attribute name="action">app.delete_chat</attribute>
+      </item>
+    </section>
   </menu>
   <menu id="create_model_menu">
     <section>