diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js
index 08d4adcb9..045a05bb2 100644
--- a/src/public/javascripts/desktop.js
+++ b/src/public/javascripts/desktop.js
@@ -176,4 +176,30 @@ noteAutocompleteService.init();
 
 if (utils.isElectron()) {
     import("./services/spell_check.js").then(spellCheckService => spellCheckService.initSpellCheck());
+}
+
+if (utils.isElectron()) {
+    $("#title-bar-buttons").show();
+
+    $("#minimize-btn").on('click', () => {
+        const { remote } = require('electron');
+        remote.BrowserWindow.getFocusedWindow().minimize();
+    });
+
+    $("#maximize-btn").on('click', () => {
+        const { remote } = require('electron');
+        const focusedWindow = remote.BrowserWindow.getFocusedWindow();
+
+        if (focusedWindow.isMaximized()) {
+            focusedWindow.unmaximize();
+        }
+        else {
+            focusedWindow.maximize();
+        }
+    });
+
+    $("#close-btn").on('click', () => {
+        const { remote } = require('electron');
+        remote.BrowserWindow.getFocusedWindow().close();
+    });
 }
\ No newline at end of file
diff --git a/src/public/stylesheets/desktop.css b/src/public/stylesheets/desktop.css
index ed7eb2025..bf0962aec 100644
--- a/src/public/stylesheets/desktop.css
+++ b/src/public/stylesheets/desktop.css
@@ -498,4 +498,8 @@ body {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+}
+
+#title-bar-buttons {
+    min-width: 100px;
 }
\ No newline at end of file
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 9bd588fab..9353c56f5 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -474,6 +474,11 @@ button.icon-button {
     width: 15em;
 }
 
+#global-menu button {
+    height: 38px;
+    margin-right: 10px;
+}
+
 #global-menu .dropdown-menu {
     width: 20em;
 }
diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
index 18f76509f..7f5d78df6 100644
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@@ -12,10 +12,6 @@
 
 <div id="container" style="display: none; grid-template-columns: minmax(<%= leftPaneMinWidth %>px, <%= leftPaneWidthPercent %>fr) minmax(0, <%= rightPaneWidthPercent %>fr)">
     <div style="display: flex;">
-        <div class="note-tab-row hide-in-zen-mode">
-            <div class="note-tab-row-content"></div>
-        </div>
-
         <div>
             <div class="dropdown" id="global-menu">
                 <button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-sm dropdown-toggle">
@@ -88,6 +84,16 @@
                 </div>
             </div>
         </div>
+
+        <div class="note-tab-row hide-in-zen-mode">
+            <div class="note-tab-row-content"></div>
+        </div>
+
+        <div id="title-bar-buttons" style="display: hidden">
+            <button class="btn icon-action bx bx-minus" id="minimize-btn"></button>
+            <button class="btn icon-action bx bx-checkbox" id="maximize-btn"></button>
+            <button class="btn icon-action bx bx-x" id="close-btn"></button>
+        </div>
     </div>
 
     <div id="header" class="hide-in-zen-mode">