diff --git a/client/ui/main.go b/client/ui/main.go
index 1c351cdda..953ea33e6 100644
--- a/client/ui/main.go
+++ b/client/ui/main.go
@@ -192,6 +192,9 @@ func main() {
 			TitleBar:                application.MacTitleBarHiddenInset,
 			CollectionBehavior:      application.MacWindowCollectionBehaviorFullScreenNone,
 		},
+		Windows: application.WindowsWindow{
+			Theme: application.Dark,
+		},
 		Linux: application.LinuxWindow{
 			Icon: iconWindow,
 		},
diff --git a/client/ui/services/windowmanager.go b/client/ui/services/windowmanager.go
index 5279d0239..b02d36cac 100644
--- a/client/ui/services/windowmanager.go
+++ b/client/ui/services/windowmanager.go
@@ -82,6 +82,9 @@ func (s *WindowManager) OpenSettings(tab string) {
 				TitleBar:                application.MacTitleBarHiddenInset,
 				CollectionBehavior:      application.MacWindowCollectionBehaviorFullScreenNone,
 			},
+			Windows: application.WindowsWindow{
+				Theme: application.Dark,
+			},
 		})
 		s.settings.OnWindowEvent(events.Common.WindowClosing, func(_ *application.WindowEvent) {
 			s.mu.Lock()
@@ -144,6 +147,9 @@ func (s *WindowManager) OpenBrowserLogin(uri string) {
 				TitleBar:                application.MacTitleBarHiddenInset,
 				CollectionBehavior:      application.MacWindowCollectionBehaviorFullScreenNone,
 			},
+			Windows: application.WindowsWindow{
+				Theme: application.Dark,
+			},
 		})
 		bl := s.browserLogin
 		// User-initiated close (red X) means cancel. Emit the event so
@@ -250,6 +256,9 @@ func (s *WindowManager) OpenSessionExpired() {
 				TitleBar:                application.MacTitleBarHiddenInset,
 				CollectionBehavior:      application.MacWindowCollectionBehaviorFullScreenNone,
 			},
+			Windows: application.WindowsWindow{
+				Theme: application.Dark,
+			},
 		})
 		s.sessionExpired.OnWindowEvent(events.Common.WindowClosing, func(_ *application.WindowEvent) {
 			s.mu.Lock()
@@ -302,6 +311,9 @@ func (s *WindowManager) OpenSessionAboutToExpire(seconds int) {
 				TitleBar:                application.MacTitleBarHiddenInset,
 				CollectionBehavior:      application.MacWindowCollectionBehaviorFullScreenNone,
 			},
+			Windows: application.WindowsWindow{
+				Theme: application.Dark,
+			},
 		})
 		s.sessionAboutToExpire.OnWindowEvent(events.Common.WindowClosing, func(_ *application.WindowEvent) {
 			s.mu.Lock()
@@ -365,6 +377,9 @@ func (s *WindowManager) OpenInstallProgress(version string) {
 				TitleBar:                application.MacTitleBarHiddenInset,
 				CollectionBehavior:      application.MacWindowCollectionBehaviorFullScreenNone,
 			},
+			Windows: application.WindowsWindow{
+				Theme: application.Dark,
+			},
 		})
 		s.installProgress.OnWindowEvent(events.Common.WindowClosing, func(_ *application.WindowEvent) {
 			s.mu.Lock()