diff --git a/src/guiengine/engine.hpp b/src/guiengine/engine.hpp
index a8c264475..c49dbf107 100644
--- a/src/guiengine/engine.hpp
+++ b/src/guiengine/engine.hpp
@@ -54,21 +54,21 @@ namespace GUIEngine
 
     /** \brief Returns the widget currently focused by given player, or NULL if none.
       * \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our
-      *       needs, so we use ours. (i.e. always call these functions are never those
+      *       needs, so we use ours. (i.e. always call these functions, never those
       *       in IGUIEnvironment)
       */
     Widget* getFocusForPlayer(const unsigned int playerID);
 
     /** \brief Focuses nothing for given player (removes any selection for this player).
       * \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our
-      *       needs, so we use ours. (i.e. always call these functions are never those
+      *       needs, so we use ours. (i.e. always call these functions, never those
       *       in IGUIEnvironment)
       */
     void focusNothingForPlayer(const unsigned int playerID);
 
     /** \brief Returns whether given the widget is currently focused by given player.
       * \note  Do NOT use irrLicht's GUI focus facilities; it's too limited for our
-      *        needs, so we use ours. (i.e. always call these functions are never those
+      *        needs, so we use ours. (i.e. always call these functions, never those
       *        in IGUIEnvironment)
       */
     bool isFocusedForPlayer(const Widget*w, const unsigned int playerID);
diff --git a/src/guiengine/event_handler.cpp b/src/guiengine/event_handler.cpp
index c46fc108b..ef1f2f9f5 100644
--- a/src/guiengine/event_handler.cpp
+++ b/src/guiengine/event_handler.cpp
@@ -914,10 +914,7 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
                     if (ribbon == NULL) break;
 
                     // give the mouse "game master" priviledges
-                    const int playerID = PLAYER_ID_GAME_MASTER; //input_manager->getPlayerKeyboardID();
-
-                    if (playerID == -1) break;
-                    if (input_manager->masterPlayerOnly() && playerID != PLAYER_ID_GAME_MASTER) break;
+                    const int playerID = PLAYER_ID_GAME_MASTER;
 
                     ribbon->mouseHovered(w, playerID);
                     if (ribbon->m_event_handler != NULL) ribbon->m_event_handler->mouseHovered(w, playerID);
@@ -927,9 +924,7 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
                 {
                     // focus on hover for other widgets
                     // give the mouse "game master" priviledges
-                    const int playerID = PLAYER_ID_GAME_MASTER; //input_manager->getPlayerKeyboardID();
-                    if (input_manager->masterPlayerOnly() && playerID != PLAYER_ID_GAME_MASTER) break;
-                    if (playerID != -1)
+                    const int playerID = PLAYER_ID_GAME_MASTER;
                     {
                         // lists don't like that combined with scrollbars
                         // (FIXME: find why instead of working around)