1 files changed, 12 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 2ffdde1c2..103a817dd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -693,6 +693,18 @@ N/A
       keySyms.mapWidth = mapWidth;
       keySyms.map = keymap;
 
+      if (XkbQueryExtension(nxagentDisplay,
+                            &nxagentXkbInfo.Opcode,
+                            &nxagentXkbInfo.EventBase,
+                            &nxagentXkbInfo.ErrorBase,
+                            &nxagentXkbInfo.MajorVersion,
+                            &nxagentXkbInfo.MinorVersion) == 0)
+      {
+          ErrorF("Unable to initialize XKEYBOARD extension.\n");
+          goto XkbError;
+      }
+
+
 #ifdef XKB
 
       /*
@@ -828,18 +840,6 @@ XkbError:
         fprintf(stderr, "nxagentKeyboardProc: Init XKB extension.\n");
         #endif
 
-        if (XkbQueryExtension(nxagentDisplay,
-                              &nxagentXkbInfo.Opcode,
-                              &nxagentXkbInfo.EventBase,
-                              &nxagentXkbInfo.ErrorBase,
-                              &nxagentXkbInfo.MajorVersion,
-                              &nxagentXkbInfo.MinorVersion) == 0)
-        {
-          ErrorF("Unable to initialize XKEYBOARD extension.\n");
-
-          goto XkbError;
-        }
-
         xkb = XkbGetKeyboard(nxagentDisplay, XkbGBN_AllComponentsMask, XkbUseCoreKbd);
 
         nxagentKeycodeConversionSetup();