diff --git a/Views/MainWindow.xaml.cs b/Views/MainWindow.xaml.cs
index 2c011ef..a476f93 100644
--- a/Views/MainWindow.xaml.cs
+++ b/Views/MainWindow.xaml.cs
@@ -17,10 +17,13 @@ namespace unison
         private readonly Settings _settingsWin;
         private readonly Radios _radiosWin;
         private readonly Shuffle _shuffleWin;
-        private readonly DispatcherTimer _timer;
-        private readonly MPDHandler _mpd;
 
         public Settings GetSettings() => _settingsWin;
+        public Radios GetRadios() => _radiosWin;
+        public Shuffle GetShuffle() => _shuffleWin;
+
+        private readonly DispatcherTimer _timer;
+        private readonly MPDHandler _mpd;
 
         public MainWindow()
         {
@@ -257,56 +260,49 @@ namespace unison
             snapcast.LaunchOrExit();
         }
 
-        private bool _radiosVisible = false;
-        private bool _shuffleVisible = false;
-        private bool _settingsVisible = false;
-
         public void Radios_Clicked(object sender, RoutedEventArgs e)
         {
-            if (_radiosVisible)
-            {
-                _radiosVisible = false;
-                _radiosWin.Hide();
-                return;
-            }
-            _radiosVisible = true;
-            _radiosWin.Show();
-            _radiosWin.Activate();
-
             if (_radiosWin.WindowState == WindowState.Minimized)
+            {
+                _radiosWin.Show();
+                _radiosWin.Activate();
                 _radiosWin.WindowState = WindowState.Normal;
+            }
+            else if (_radiosWin.WindowState == WindowState.Normal)
+            {
+                _radiosWin.Hide();
+                _radiosWin.WindowState = WindowState.Minimized;
+            }
         }
 
         public void Shuffle_Clicked(object sender, RoutedEventArgs e)
         {
-            if (_shuffleVisible)
-            {
-                _shuffleVisible = false;
-                _shuffleWin.Hide();
-                return;
-            }
-            _shuffleVisible = true;
-            _shuffleWin.Show();
-            _shuffleWin.Activate();
-
             if (_shuffleWin.WindowState == WindowState.Minimized)
+            {
+                _shuffleWin.Show();
+                _shuffleWin.Activate();
                 _shuffleWin.WindowState = WindowState.Normal;
+            }
+            else if (_shuffleWin.WindowState == WindowState.Normal)
+            {
+                _shuffleWin.Hide();
+                _shuffleWin.WindowState = WindowState.Minimized;
+            }
         }
 
         public void Settings_Clicked(object sender, RoutedEventArgs e)
         {
-            if (_settingsVisible)
-            {
-                _settingsVisible = false;
-                _settingsWin.Hide();
-                return;
-            }
-            _settingsVisible = true;
-            _settingsWin.Show();
-            _settingsWin.Activate();
-
             if (_settingsWin.WindowState == WindowState.Minimized)
+            {
+                _settingsWin.Show();
+                _settingsWin.Activate();
                 _settingsWin.WindowState = WindowState.Normal;
+            }
+            else if (_settingsWin.WindowState == WindowState.Normal)
+            {
+                _settingsWin.Hide();
+                _settingsWin.WindowState = WindowState.Minimized;
+            }
         }
 
         private void TimeSlider_DragStarted(object sender, DragStartedEventArgs e)
diff --git a/Views/Radios.xaml.cs b/Views/Radios.xaml.cs
index fce3c79..5262432 100644
--- a/Views/Radios.xaml.cs
+++ b/Views/Radios.xaml.cs
@@ -23,6 +23,9 @@ namespace unison
         {
             InitializeComponent();
             Initialize();
+            InitHwnd();
+
+            WindowState = WindowState.Minimized;
         }
 
         public async void Initialize()
diff --git a/Views/Shuffle.xaml.cs b/Views/Shuffle.xaml.cs
index 7f8b4ed..871469d 100644
--- a/Views/Shuffle.xaml.cs
+++ b/Views/Shuffle.xaml.cs
@@ -32,11 +32,15 @@ namespace unison
         public Shuffle()
         {
             InitializeComponent();
+            InitHwnd();
+        
             GenreList = new();
             FolderList = new();
             Filters = new();
             SongFilterNumber.Text = "0";
 
+            WindowState = WindowState.Minimized;
+
             _mpd = (MPDHandler)Application.Current.Properties["mpd"];
             _shuffle = (ShuffleHandler)Application.Current.Properties["shuffle"];
         }