diff --git a/electron.js b/electron.js
index 6c50146d34..f9f23d4cb2 100644
--- a/electron.js
+++ b/electron.js
@@ -373,7 +373,7 @@ function createWindow () {
 				break;
 
 			case 'maximize':
-				win.setFullScreen(!win.isFullScreen());
+				win.maximize();
 				break;
 
 			case 'close':
@@ -545,6 +545,14 @@ function menuInit () {
 		},
 		{
 			role: 'windowMenu',
+			submenu: [
+				{ role: 'minimize' },
+      			{ role: 'zoom' },
+				{
+					label: 'Fullscreen', type: 'checkbox', checked: win.isFullScreen(),
+					click: () => { win.setFullScreen(!win.isFullScreen()); }
+				},
+			]
 		},
 		{
 			label: 'Help',