diff --git a/src/Blaze-Brigade/Blaze_Brigade/Game.cs b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
index 17799edca8a261b8ab806f5551981d072f60fd12..fa32d847c32219b33e2475d1181386316a7eceac 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Game.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
@@ -224,7 +224,7 @@ namespace Controller
                             #endregion
 
                             #region Drop Down menu
-                            if (GameState.getMenuOpen()) // if dropDowMenu should be opened, draw dropDownMenu
+                            if ((GameState.getMenuOpen())&&(!GameState.getIsAnimating())) // if dropDowMenu should be opened, draw dropDownMenu
                             {
                                 foreach (MenuButton button in unit.getMenuButtons())
                                 {
diff --git a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
index 02630ee771a5724b9a3cbe1dbbaac3b628621ca0..595a505c42d8c81cdff422a2eac3f04737d45ff5 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
@@ -159,7 +159,10 @@ namespace Controller
                 int buttonY = (int) menuButtons[i].getPixelCoordinates().Y;
                 if (buttonX <= clickX && clickX < buttonX+128 && buttonY <= clickY && clickY < buttonY+32)
                 {
+                    if (GameState.getMenuOpen())
+                    {
                     return menuButtons[i];
+                    }
                 }
             }
             return null;