diff --git a/src/main.py b/src/main.py
index be90052..ffd7b93 100644
--- a/src/main.py
+++ b/src/main.py
@@ -57,7 +57,8 @@ class AlpacaApplication(Adw.Application):
     def __init__(self, version):
         super().__init__(application_id='com.jeffser.Alpaca',
                          flags=Gio.ApplicationFlags.DEFAULT_FLAGS)
-        self.create_action('quit', lambda *_: self.props.active_window.closing_app(None), ['<primary>w', '<primary>q'])
+        self.create_action('quit', lambda *_: self.props.active_window.closing_app(None), ['<primary>q'])
+        self.set_accels_for_action('app.delete_current_chat', ['<primary>w'])
         self.create_action('preferences', lambda *_: self.props.active_window.preferences_dialog.present(self.props.active_window), ['<primary>comma'])
         self.create_action('about', self.on_about_action)
         self.set_accels_for_action("win.show-help-overlay", ['<primary>slash'])
diff --git a/src/window.ui b/src/window.ui
index ff46fa6..2470bdb 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -1125,10 +1125,16 @@
             <property name="title" translatable="yes">General</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;ctrl&gt;W</property>
+                <property name="accelerator">&lt;ctrl&gt;Q</property>
                 <property name="title" translatable="yes">Close application</property>
               </object>
             </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="accelerator">&lt;ctrl&gt;W</property>
+                <property name="title" translatable="yes">Delete current chat</property>
+              </object>
+            </child>
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="accelerator">&lt;ctrl&gt;I</property>