diff --git a/src/bin/e_xkb.c b/src/bin/e_xkb.c
index e1984da47..74b2426e1 100644
--- a/src/bin/e_xkb.c
+++ b/src/bin/e_xkb.c
@@ -221,8 +221,12 @@ e_xkb_layout_set(const char *name)
 EAPI const char *
 e_xkb_layout_name_reduce(const char *name)
 {
-   if ((name) && (strchr(name, '/'))) name = strchr(name, '/') + 1;
-   return name;
+   const char *s;
+
+   if (!name) return NULL;
+   s = strchr(name, '/');
+   if (s) s++;
+   return s;
 }
 
 EAPI void