diff --git a/main.ts b/main.ts
index 195c409ce..6a3da8c33 100644
--- a/main.ts
+++ b/main.ts
@@ -224,6 +224,8 @@ function createMainWindow(): void {
             contextIsolation: false,
         },
         show: false,
+        minWidth: 800,
+        minHeight: 600,
     });
 
     setInitialWindowState(mainWindow);
diff --git a/src/app/ui/components/window-controls/window-controls.component.html b/src/app/ui/components/window-controls/window-controls.component.html
index 5d75857c2..aab35d6a9 100644
--- a/src/app/ui/components/window-controls/window-controls.component.html
+++ b/src/app/ui/components/window-controls/window-controls.component.html
@@ -1,4 +1,4 @@
-<div class="window-controls">
+<div class="window-controls theme-header-background">
     <div class="window-button" (click)="minButtonClick()" [ngClass]="{ 'window-button__high-contrast': this.highContrast }">
         <svg width="11" height="1" viewBox="0 0 11 1">
             <path d="m11 0v1h-11v-1z" stroke-width=".26208" />
diff --git a/src/app/ui/components/window-controls/window-controls.component.scss b/src/app/ui/components/window-controls/window-controls.component.scss
index 880552b9c..5dc42e05a 100644
--- a/src/app/ui/components/window-controls/window-controls.component.scss
+++ b/src/app/ui/components/window-controls/window-controls.component.scss
@@ -5,3 +5,11 @@
     flex-direction: row;
     height: 100%;
 }
+
+@media (min-width: 600px) and (max-width: 1100px) {
+    .window-controls {
+        position: absolute;
+        top: 0;
+        right: 0;
+    }
+}