diff --git a/src/index.js b/src/index.js
index b87f1f19..ad6a879c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,7 +3,7 @@
 var remote = require('remote');
 var url = require('url');
 
-var contextMenu = require('./context-menu');
+var contextMenu = require('./menus/context');
 
 var webView = document.getElementById('mainWebview');
 
diff --git a/src/main.js b/src/main.js
index 9891dcbd..e84527e3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,7 +5,7 @@ var BrowserWindow = require('browser-window'); // Module to create native browse
 var Menu = require('menu');
 var Tray = require('tray');
 var ipc = require('ipc');
-var appMenu = require('./app-menu');
+var appMenu = require('./menus/app');
 
 var client = null;
 if (process.argv.indexOf('--livereload') > 0) {
@@ -54,6 +54,8 @@ app.on('ready', function() {
   if (process.platform === 'win32') {
     trayIcon = new Tray(__dirname + '/tray.png');
     trayIcon.setToolTip(app.getName());
+    var tray_menu = require('./menus/tray').createDefault();
+    trayIcon.setContextMenu(tray_menu);
     trayIcon.on('balloon-clicked', function() {
       mainWindow.focus();
     });
@@ -93,8 +95,8 @@ app.on('ready', function() {
     }
   });
 
-  var menu = appMenu.createMenu(mainWindow);
-  Menu.setApplicationMenu(menu);
+  var app_menu = appMenu.createMenu(mainWindow);
+  Menu.setApplicationMenu(app_menu);
 
   // Emitted when the window is closed.
   mainWindow.on('closed', function() {
diff --git a/src/app-menu.js b/src/menus/app.js
similarity index 100%
rename from src/app-menu.js
rename to src/menus/app.js
diff --git a/src/context-menu.js b/src/menus/context.js
similarity index 100%
rename from src/context-menu.js
rename to src/menus/context.js
diff --git a/src/menus/tray.js b/src/menus/tray.js
new file mode 100644
index 00000000..8796a814
--- /dev/null
+++ b/src/menus/tray.js
@@ -0,0 +1,19 @@
+'use strict';
+
+var Menu = require('menu');
+var MenuItem = require('menu-item');
+
+var createDefault = function() {
+  var menu = new Menu();
+  menu.append(new MenuItem({
+    label: 'Quit',
+    click: function(item) {
+      require('app').quit();
+    }
+  }));
+  return menu;
+}
+
+module.exports = {
+  createDefault: createDefault
+};