--- a/wMenu.xaml.cs
+++ b/wMenu.xaml.cs
@@ -2,26 +2,24 @@
 
 namespace YuGiOh_Ultra {
     public partial class wMenu : Window {
-        private bool _quit = true;
+        private wDeckManager _wdm;
 
-        public wMenu() {
-            InitializeComponent();
-        }
+        public wMenu() { InitializeComponent(); }
 
         private void BtDeckMn_Click( object sender, RoutedEventArgs e ) {
-            new wDeckManager().Show();
+            if ( _wdm == null || !_wdm.IsLoaded ) {
+                _wdm = new wDeckManager();
+                _wdm.Show();
+            }
         }
 
         private void BtPlay_Click( object sender, RoutedEventArgs e ) {
+            if( _wdm != null && _wdm.IsLoaded ) _wdm.Close(); //you can't edit deck in battle!
+
             Com.me.InitBattle();
             new wBattle().Show();
 
-            _quit = false;
             this.Close();
-        }
-
-        private void Window_Closed( object sender, System.EventArgs e ) {
-            if( _quit ) Application.Current.Shutdown();
         }
     }
 }