Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp	(revision 66588)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp	(revision 66589)
@@ -51,5 +51,4 @@
 {
     /* default settings */
-    remapScancodes = QString::null;
     proxySettings = QString::null;
     hostScreenSaverDisabled = false;
@@ -58,5 +57,4 @@
 VBoxGlobalSettingsData::VBoxGlobalSettingsData (const VBoxGlobalSettingsData &that)
 {
-    remapScancodes = that.remapScancodes;
     proxySettings = that.proxySettings;
     hostScreenSaverDisabled = that.hostScreenSaverDisabled;
@@ -70,6 +68,5 @@
 {
     return this == &that ||
-        (remapScancodes == that.remapScancodes &&
-         proxySettings == that.proxySettings &&
+        (proxySettings == that.proxySettings &&
          hostScreenSaverDisabled == that.hostScreenSaverDisabled
         );
@@ -91,5 +88,4 @@
 gPropertyMap[] =
 {
-    { "GUI/RemapScancodes",                        "remapScancodes",          "(\\d+=\\d+,)*\\d+=\\d+", true },
     { "GUI/ProxySettings",                         "proxySettings",           "[\\s\\S]*", true },
     { "GUI/HostScreenSaverDisabled",               "hostScreenSaverDisabled", "true|false", true }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h	(revision 66588)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h	(revision 66589)
@@ -37,5 +37,4 @@
 private:
 
-    QString remapScancodes;
     QString proxySettings;
     bool hostScreenSaverDisabled;
@@ -49,5 +48,4 @@
 {
     Q_OBJECT
-    Q_PROPERTY (QString remapScancodes READ remapScancodes WRITE setRemapScancodes)
     Q_PROPERTY (QString proxySettings READ proxySettings WRITE setProxySettings)
     Q_PROPERTY (bool hostScreenSaverDisabled READ hostScreenSaverDisabled WRITE setHostScreenSaverDisabled)
@@ -65,10 +63,4 @@
 
     // Properties
-
-    QString remapScancodes() const { return data()->remapScancodes; }
-    void setRemapScancodes (const QString &aRemapScancodes)
-    {
-        mData()->remapScancodes = aRemapScancodes;
-    }
 
     QString proxySettings() const { return data()->proxySettings; }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 66588)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 66589)
@@ -60,4 +60,5 @@
 const char* UIExtraDataDefs::GUI_Input_HostKeyCombination = "GUI/Input/HostKeyCombination";
 const char* UIExtraDataDefs::GUI_Input_AutoCapture = "GUI/Input/AutoCapture";
+const char* UIExtraDataDefs::GUI_RemapScancodes = "GUI/RemapScancodes";
 
 /* Settings: Storage: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 66588)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 66589)
@@ -94,4 +94,6 @@
         /** Holds whether Runtime UI auto-capture is enabled. */
         extern const char* GUI_Input_AutoCapture;
+        /** Holds Runtime UI remapped scan codes. */
+        extern const char* GUI_RemapScancodes;
     /** @} */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 66588)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 66589)
@@ -2480,4 +2480,16 @@
 }
 
+QString UIExtraDataManager::remappedScanCodes()
+{
+    /* Acquire remapped scan codes: */
+    QString strRemappedScanCodes = extraDataString(GUI_RemapScancodes);
+    /* Clear the record if it's absolutely wrong: */
+    QRegularExpression reTemplate("(\\d+=\\d+,)*\\d+=\\d+");
+    if (!reTemplate.match(strRemappedScanCodes).hasMatch())
+        strRemappedScanCodes.clear();
+    /* Return remapped scan codes: */
+    return strRemappedScanCodes;
+}
+
 QString UIExtraDataManager::recentFolderForHardDrives()
 {
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 66588)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 66589)
@@ -228,4 +228,7 @@
         /** Defines whether the Runtime UI auto-capture is @a fEnabled. */
         void setAutoCaptureEnabled(bool fEnabled);
+
+        /** Returns the Runtime UI remapped scan codes. */
+        QString remappedScanCodes();
     /** @} */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp	(revision 66588)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp	(revision 66589)
@@ -1603,5 +1603,5 @@
 #ifdef VBOX_WS_X11
     /* Initialize the X keyboard subsystem: */
-    initMappedX11Keyboard(QX11Info::display(), vboxGlobal().settings().publicProperty("GUI/RemapScancodes"));
+    initMappedX11Keyboard(QX11Info::display(), gEDataManager->remappedScanCodes());
 #endif /* VBOX_WS_X11 */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 66588)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 66589)
@@ -32,5 +32,5 @@
 /* GUI includes: */
 # include "UIHostComboEditor.h"
-# include "UIExtraDataDefs.h"
+# include "UIExtraDataManager.h"
 # include "UIIconPool.h"
 # include "VBoxGlobal.h"
@@ -584,5 +584,5 @@
 #elif defined(VBOX_WS_X11)
     /* Initialize the X keyboard subsystem: */
-    initMappedX11Keyboard(QX11Info::display(), vboxGlobal().settings().publicProperty("GUI/RemapScancodes"));
+    initMappedX11Keyboard(QX11Info::display(), gEDataManager->remappedScanCodes());
 #endif /* VBOX_WS_X11 */
 }