diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 14ed4fd2c48..51ac9a77759 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -864,15 +864,8 @@ public final class GamePanel extends javax.swing.JPanel {
 
     public void select(String message, GameView gameView, int messageId, Map<String, Serializable> options) {
         updateGame(gameView, options);
-        String messageToDisplay = message;
-        Map<String, Serializable> panelOptions = null;
         for (PlayerView playerView : gameView.getPlayers()) {
             if (playerView.getPlayerId().equals(playerId)) {
-                if (playerView.isActive()) {
-                    panelOptions = new HashMap<>();
-                    panelOptions.put("your_turn", true);
-                    messageToDisplay = message + " <div style='font-size:11pt'>Your turn / " + gameView.getStep().toString() + "</div>";
-                }
                 // magenoxx: because of uncaught bug with saving state, rolling back and stack
                 // undo is allowed only for empty stack
                 if (playerView.getStatesSavedSize() > 0 && gameView.getStack().size() == 0) {
@@ -880,7 +873,18 @@ public final class GamePanel extends javax.swing.JPanel {
                 }
                 break;
             }
+
         }
+        Map<String, Serializable> panelOptions = new HashMap<>();
+        panelOptions.put("your_turn", true);
+        String playerName;
+        if (gameView.getActivePlayerId().equals(playerId)) {
+            playerName = "Your turn";
+        } else {
+            playerName = gameView.getActivePlayerName();
+        }
+        String messageToDisplay = message + "<div style='font-size:11pt'>" + playerName +" / " + gameView.getStep().toString() + "</div>";
+
         this.feedbackPanel.getFeedback(FeedbackMode.SELECT, messageToDisplay, gameView.getSpecial(), panelOptions, messageId);
     }
 
diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java
index 23f920bb3d3..c5f3f6d67a0 100644
--- a/Mage/src/mage/game/GameImpl.java
+++ b/Mage/src/mage/game/GameImpl.java
@@ -1719,14 +1719,13 @@ public abstract class GameImpl implements Game, Serializable {
         if (simulation) {
             return;
         }
-        String message = this.state.getTurn().getStepType().toString();
+        String message;
         if (this.canPlaySorcery(playerId)) {
-            message += " - play spells and abilities.";
+            message = "Play spells and abilities.";
         }
         else {
-            message +=  " - play instants and activated abilities.";
+            message =  "Play instants and activated abilities.";
         }
-
         playerQueryEventSource.select(playerId, message);
     }