diff --git a/psst-gui/src/main.rs b/psst-gui/src/main.rs
index 009d3f9d..7ccc63e4 100644
--- a/psst-gui/src/main.rs
+++ b/psst-gui/src/main.rs
@@ -59,10 +59,12 @@ fn main() {
         WebApi::global().load_local_tracks(state.config.username().unwrap());
     } else {
         // No configured credentials, open the account setup.
-        let mut window = ui::account_setup_window();
+        let window = ui::account_setup_window();
 
         if state.config.kiosk_mode {
-            window = ui::kiosk_setup_window();
+           let window = ui::kiosk_setup_window();
+        } else {
+
         }
 
         delegate = Delegate::with_preferences(window.id);
diff --git a/psst-gui/src/ui/mod.rs b/psst-gui/src/ui/mod.rs
index 07253559..ed686629 100644
--- a/psst-gui/src/ui/mod.rs
+++ b/psst-gui/src/ui/mod.rs
@@ -75,9 +75,16 @@ pub fn main_window(config: &Config) -> WindowDesc<AppState> {
 }
 
 pub fn preferences_window() -> WindowDesc<AppState> {
-    // Change this
     let win_size = (theme::grid(50.0), theme::grid(55.0));
 
+    // On Windows, the window size includes the titlebar.
+    let win_size = if cfg!(target_os = "windows") {
+        const WINDOWS_TITLEBAR_OFFSET: f64 = 56.0;
+        (win_size.0, win_size.1 + WINDOWS_TITLEBAR_OFFSET)
+    } else {
+        win_size
+    };
+    
     let win = WindowDesc::new(preferences_widget())
         .title("Preferences")
         .window_size(win_size)