diff --git a/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java b/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
index 4695a3c93755e73d2fb2b509d7a12e5d9af8f5de..11a94c4d81b097ceeaaf8c5c22c58742798eb822 100644
--- a/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
+++ b/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
@@ -267,6 +267,8 @@ public class GameMenuPage extends MenuPage {
      * Creates and prepares Difficulty slider, Difficulty labels and Buttons
      */
     public void prepareDifficulty() {
+        stepSoundsEnabled = false;
+
         final float difficultyY = getScreen().getSceneInnerHeight() * DIFFICULTY_BOTTOM_OFFSET - pagedScrollPaneOffsetY;
 
         // Difficulty bar
@@ -283,7 +285,6 @@ public class GameMenuPage extends MenuPage {
         diffBarImage.setSize(diffBarWidth, diffBarHeight);
         addActor(diffBarImage);
 
-
         //Difficulty Thumb
         final TextureRegion diff = getScreen().getScreenTextureRegion(GameMenuAssets.DIFF_THUMB_EASY);
 
@@ -401,10 +402,8 @@ public class GameMenuPage extends MenuPage {
             }
         });
         gameDifficulty = UserDifficultySettingsDAO.getUserSettingsByGame(TablexiaSettings.getInstance().getSelectedUser().getId(), game.getGameNumber());
-        //dragSwitchListener.switchToStep(gameDifficulty.getDifficultyNumber() - 1);
-        dragSwitchListener.switchToStep(gameDifficulty.getDifficultyNumber() - 1, false);
-        //Enabling step sounds later
-        //so it doesn't play 'em when initially setting difficulties from database...
+        dragSwitchListener.switchToStep(gameDifficulty.getDifficultyNumber() - 1);
+
         stepSoundsEnabled = true;
     }
 
@@ -569,8 +568,10 @@ public class GameMenuPage extends MenuPage {
 			@Override
 			public void run() {
 				if (selectedUserEvent.isUserSelected()) {
+                    stepSoundsEnabled = false;
 					gameDifficulty = UserDifficultySettingsDAO.getUserSettingsByGame(TablexiaSettings.getInstance().getSelectedUser().getId(), game.getGameNumber());
 					dragSwitchListener.switchToStep(gameDifficulty.getDifficultyNumber() - 1);
+                    stepSoundsEnabled = true;
 				}
 			}
 		});