thunar-volman-settings/Makefile.am | 1 +
 thunar-volman/tvm-input-device.c   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/thunar-volman-settings/Makefile.am b/thunar-volman-settings/Makefile.am
index b3d3622..7d99577 100644
--- a/thunar-volman-settings/Makefile.am
+++ b/thunar-volman-settings/Makefile.am
@@ -21,6 +21,7 @@ AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
 	-DBINDIR=\"$(bindir)\"						\
+	-DLIBDIR=\"$(libdir)\"						\
 	-DG_LOG_DOMAIN=\"thunar-volman-settings\"			\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-DDATADIR=\"$(datadir)\"					\
diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-input-device.c
index d78ce95..30855a3 100644
--- a/thunar-volman/tvm-input-device.c
+++ b/thunar-volman/tvm-input-device.c
@@ -74,6 +74,10 @@ tvm_input_device_added (TvmContext *context)
       icon = "input-keyboard";
       summary = _("Keyboard detected");
       message = _("A keyboard was detected");
+
+	  /* Try to run xfce4-fixkeyboard script for restore xkb settings
+	   * Errors is ok */
+	  tvm_run_command (context, NULL, "xfce4-fixkeyboard", NULL);
     }
   else if (is_tablet
            || g_strcmp0 (driver, "wacom") == 0