diff --git a/CHANGELOG.md b/CHANGELOG.md
index f689a27b979..9e908a395be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [Unreleased]
+
+### Added
+   * Add keyboard shortcut to quit the app on Windows ([#1202](https://github.com/lbryio/lbry-app/pull/1202))
+
 ## [0.21.2] - 2018-03-22
 
 
@@ -44,9 +49,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
   * LBRY URLs not working on Linux ([#1120](https://github.com/lbryio/lbry-app/issues/1120))
   * Fix Windows notifications not showing ([#1145](https://github.com/lbryio/lbry-app/pull/1145))
   * Fix export issues ([#1163](https://github.com/lbryio/lbry-app/pull/1163))
-
-
-
+ 
 ## [0.20.0] - 2018-01-30
 
 ### Added
diff --git a/src/main/menu/setupBarMenu.js b/src/main/menu/setupBarMenu.js
index 14c4e74db3e..08fc9fab2eb 100644
--- a/src/main/menu/setupBarMenu.js
+++ b/src/main/menu/setupBarMenu.js
@@ -2,6 +2,10 @@ import { app, Menu, shell } from 'electron';
 
 export default () => {
   const template = [
+    {
+      label: 'File',
+      submenu: [{ role: 'quit', accelerator: 'CmdOrCtrl+Q' }],
+    },
     {
       label: 'Edit',
       submenu: [