diff --git a/src/pages/shared/window-buttons/window-buttons.html b/src/pages/shared/window-buttons/window-buttons.html
index 49036c7dc..b4feb7218 100644
--- a/src/pages/shared/window-buttons/window-buttons.html
+++ b/src/pages/shared/window-buttons/window-buttons.html
@@ -24,10 +24,6 @@
     </head>
 
     <body>
-        <div
-            style="height: 15px; width: 90vw; z-index: 9999; position: fixed;"
-            class="drag"
-        ></div>
         <div id="nice-titlebar" class="bar drag">
             <div id="mac" class="hide no-drag">
                 <span id="window-title" class="hide"></span>
@@ -40,7 +36,7 @@
 
             <div id="win" class="hide">
                 <div class="row">
-                    <div class="col s9 left-align no-drag">
+                    <div class="col s9 left-align">
                         <div class="title">
                             <i
                                 class="material-icons tiny tiny-margin left"
diff --git a/src/pages/shared/window-buttons/window-buttons.js b/src/pages/shared/window-buttons/window-buttons.js
index 97ffbb932..2746044c8 100644
--- a/src/pages/shared/window-buttons/window-buttons.js
+++ b/src/pages/shared/window-buttons/window-buttons.js
@@ -9,25 +9,26 @@ const macElement = document.getElementById('mac')
 
 const webview = document.querySelector('webview')
 
-if (isMac()) {
-    winElement.remove()
-    macElement.classList.remove('hide')
-} else if (isWindows()) {
-    macElement.remove()
-    winElement.classList.remove('hide')
-} else if (isLinux()) {
-    winElement.remove()
-    macElement.remove()
-}
-
 if (store.get('titlebar-type', 'nice') !== 'nice') {
-    document.getElementById('nice-titlebar').style.display = 'none'
-    document.getElementById('nice-titlebar').style.height = 0
+    document.getElementById('nice-titlebar').style.height = '15px'
+    document
+        .getElementById('nice-titlebar')
+        .removeChild(document.getElementById('nice-titlebar').firstChild)
 
     document.getElementById('webview').style.height = '100vh'
 } else {
+    if (isMac()) {
+        winElement.remove()
+        macElement.classList.remove('hide')
+    } else if (isWindows()) {
+        macElement.remove()
+        winElement.classList.remove('hide')
+    } else if (isLinux()) {
+        winElement.remove()
+        macElement.remove()
+    }
     document.getElementById('webview').style.height = '95vh'
-    document.getElementById('content').style.marginTop = '29px'
+    document.getElementById('content').style.marginTop = '5vh'
 }
 
 ipc.on('window-is-maximized', function (_, value) {
