1 files changed, 6 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index d61c65b1a..404ed035d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -27,6 +27,7 @@
 #include "Options.h"
 #include "Keystroke.h"
 #include "Drawable.h"
+#include "Init.h" /* extern int nxagentX2go */
 
 #include <unistd.h>
 
@@ -261,6 +262,11 @@ static void parse_keystroke_file(void)
   char *homefile = "/.nx/config/keystrokes.cfg";
   char *etcfile = "/etc/nxagent/keystrokes.cfg";
 
+  if (nxagentX2go) {
+    homefile = "/.x2go/config/keystrokes.cfg";
+    etcfile = "/etc/x2go/keystrokes.cfg";
+  }
+
   if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0)
   {
     filename = strdup(nxagentKeystrokeFile);