diff --git a/src/SFML/Window/Unix/KeyboardImpl.cpp b/src/SFML/Window/Unix/KeyboardImpl.cpp
index d30fd9d02..621fb73a3 100644
--- a/src/SFML/Window/Unix/KeyboardImpl.cpp
+++ b/src/SFML/Window/Unix/KeyboardImpl.cpp
@@ -782,7 +782,7 @@ String KeyboardImpl::getDescription(Keyboard::Scancode code)
         case Keyboard::Scan::LaunchMail:         return "Launch Mail";
         case Keyboard::Scan::LaunchMediaSelect:  return "Launch Media Select";
 
-        default:                               return "Unknown Scancode";
+        default:                                 return "Unknown Scancode";
     }
 }
 
diff --git a/src/SFML/Window/Unix/WindowImplX11.cpp b/src/SFML/Window/Unix/WindowImplX11.cpp
index d5038e9c0..86a3fb764 100644
--- a/src/SFML/Window/Unix/WindowImplX11.cpp
+++ b/src/SFML/Window/Unix/WindowImplX11.cpp
@@ -2005,6 +2005,15 @@ bool WindowImplX11::processEvent(XEvent& windowEvent)
             break;
         }
 
+        // Keyboard mapping changed
+        case MappingNotify:
+        {
+            if (windowEvent.xmapping.request == MappingKeyboard)
+                XRefreshKeyboardMapping(&windowEvent.xmapping);
+
+            break;
+        }
+
         // Window unmapped
         case UnmapNotify:
         {