diff --git a/src/window.py b/src/window.py
index 9fe1ba1..4877394 100644
--- a/src/window.py
+++ b/src/window.py
@@ -940,6 +940,8 @@ class AlpacaWindow(Adw.ApplicationWindow):
         self.update_chat_list()
         if len(self.chats['chats'])==0:
             self.new_chat()
+        if self.chats['selected_chat'] == chat_name:
+            self.chat_list_box.select_row(self.chat_list_box.get_row_at_index(0))
 
     def rename_chat(self, old_chat_name, new_chat_name, label_element):
         new_chat_name = self.generate_numbered_name(new_chat_name, self.chats["chats"].keys())
diff --git a/src/window.ui b/src/window.ui
index c000243..1409a7f 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -79,7 +79,7 @@
                     <child type="start">
                       <object class="GtkToggleButton" id="show_sidebar_button">
                         <property name="icon-name">sidebar-show-symbolic</property>
-                        <property name="tooltip-text" translatable="yes">Toggle Sidebar</property>
+                        <property name="tooltip-text" translatable="yes">Toggle sidebar</property>
                         <property name="active" bind-source="split_view_overlay" bind-property="show-sidebar" bind-flags="sync-create"/>
                       </object>
                     </child>
@@ -117,7 +117,7 @@
                       <object class="GtkMenuButton">
                         <property name="primary">False</property>
                         <property name="icon-name">open-menu-symbolic</property>
-                        <property name="tooltip-text" translatable="yes">Chat Menu</property>
+                        <property name="tooltip-text" translatable="yes">Chat menu</property>
                         <property name="menu-model">secondary_menu</property>
                       </object>
                     </child>