diff --git a/python/libwmfs.c b/python/libwmfs.c
index 1d7163a..175c932 100644
--- a/python/libwmfs.c
+++ b/python/libwmfs.c
@@ -124,7 +124,6 @@ wmfs_uicb(PyObject *self, PyObject *args)
                      8, PropModeReplace, (unsigned char*)cmd, strlen(cmd));
 
      send_client_message("_WMFS_FUNCTION", data);
-     send_client_message("_WMFS_CMD", data);
 
      Py_INCREF(Py_None);
 
diff --git a/src/event.c b/src/event.c
index 9d9fc12..1dcea95 100644
--- a/src/event.c
+++ b/src/event.c
@@ -133,7 +133,6 @@ clientmessageevent(XClientMessageEvent *ev)
                     client_focus(c);
      }
 
-
      /* Manage _NET_WM_STATE */
      if(mess_t == net_wm_state)
           if((c = client_gb_win(ev->window)))
@@ -169,8 +168,9 @@ clientmessageevent(XClientMessageEvent *ev)
           }
      }
 
-
-     if(mess_t == wmfs_function && ev->data.l[4] == True)
+     /* Manage _WMFS_FUNCTION && _WMFS_CMD */
+     if((mess_t == wmfs_function && ev->data.l[4] == True)
+        || (mess_t == wmfs_cmd && ev->data.l[4] == True))
      {
           uchar *ret_func = NULL;
           uchar *ret_cmd = NULL;
diff --git a/src/ewmh.c b/src/ewmh.c
index de454e8..e5fc556 100644
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -79,9 +79,8 @@ ewmh_init_hints(void)
      net_atom[wmfs_current_screen]            = ATOM("_WMFS_CURRENT_SCREEN");
      net_atom[wmfs_current_layout]            = ATOM("_WMFS_CURRENT_LAYOUT");
      net_atom[wmfs_tag_names]                 = ATOM("_WMFS_TAG_NAMES");
-
-     net_atom[wmfs_function] = ATOM("_WMFS_FUNCTION");
-     net_atom[wmfs_cmd] = ATOM("_WMFS_CMD");
+     net_atom[wmfs_function]                  = ATOM("_WMFS_FUNCTION");
+     net_atom[wmfs_cmd]                       = ATOM("_WMFS_CMD");
 
      XChangeProperty(dpy, ROOT, net_atom[net_supported], XA_ATOM, 32,
                      PropModeReplace, (uchar*)net_atom, net_last);