diff --git a/src/components/CustomTitlebar.svelte b/src/components/CustomTitlebar.svelte
index 09370188..cfeaa5be 100644
--- a/src/components/CustomTitlebar.svelte
+++ b/src/components/CustomTitlebar.svelte
@@ -94,15 +94,10 @@
     }
   }
   #window-title {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-grow: 1;
-    overflow: hidden;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
     font-family: inherit;
-
-    span {
-      line-height: 1.5;
-    }
   }
 </style>
diff --git a/src/components/Titlebar/WindowControls.svelte b/src/components/Titlebar/WindowControls.svelte
index dfd32d4b..820c3353 100644
--- a/src/components/Titlebar/WindowControls.svelte
+++ b/src/components/Titlebar/WindowControls.svelte
@@ -54,6 +54,7 @@
     grid-template-columns: repeat(3, 46px);
     height: 100%;
     -webkit-app-region: no-drag;
+    margin-left: auto;
   }
   .window-button {
     grid-row: 1 / span 1;