diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c
index 9b7945b4c..3db512ccd 100644
--- a/src/bin/e_ipc.c
+++ b/src/bin/e_ipc.c
@@ -385,19 +385,6 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
 	       }
  	  }
 	break;
-      case E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_SET:
-	if (e_ipc_codec_double_dec(e->data, e->size,
-				   &(e_config->menus_click_drag_timeout)))
-	  {
-	     E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
-	     e_config_save_queue();
-	  }
-	break;
-      case E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET:
-	_e_ipc_reply_double_send(e->client,
-				 e_config->menus_click_drag_timeout,
-				 E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY);
-	break;
       case E_IPC_OP_BORDER_SHADE_ANIMATE_SET:
 	if (e_ipc_codec_int_dec(e->data, e->size,
 				&(e_config->border_shade_animate)))
diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h
index b86eb811c..0a87f869b 100644
--- a/src/bin/e_ipc_handlers.h
+++ b/src/bin/e_ipc_handlers.h
@@ -1070,6 +1070,46 @@ break;
 #endif
 #undef HDL
 
+/****************************************************************************/
+#define HDL E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_SET
+#if (TYPE == E_REMOTE_OPTIONS)
+   OP("-menus-click-drag-timeout-set", 1, "Set the time (in sec) between a mouse press and release that will keep the menu up anyway", 0, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+   REQ_DOUBLE(atof(params[0]), HDL);
+#elif (TYPE == E_WM_IN)
+   START_DOUBLE(val, HDL);
+   e_config->menus_click_drag_timeout = val;
+   E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
+   SAVE;
+   END_DOUBLE;
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET
+#if (TYPE == E_REMOTE_OPTIONS)
+   OP("-menus-click-drag-timeout-get", 0, "Get the time (in sec) between a mouse press and release that will keep the menu up anyway", 1, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+   REQ_NULL(HDL)
+#elif (TYPE == E_WM_IN)
+   SEND_DOUBLE(e_config->menus_click_drag_timeout, E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY, HDL);
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY
+#if (TYPE == E_REMOTE_OPTIONS)
+#elif (TYPE == E_REMOTE_OUT)
+#elif (TYPE == E_WM_IN)
+#elif (TYPE == E_REMOTE_IN)
+   START_DOUBLE(val, HDL)
+   printf("REPLY: %3.3f\n", val);
+   END_DOUBLE;
+#endif
+#undef HDL
+
 #if 0
 }
 #endif
diff --git a/src/bin/e_remote_main.c b/src/bin/e_remote_main.c
index adc2446aa..91f18f5a2 100644
--- a/src/bin/e_remote_main.c
+++ b/src/bin/e_remote_main.c
@@ -583,8 +583,6 @@ E_IPC_Opt_Handler handlers[] =
    OREQ("-binding-key-list", "List all key bindings", E_IPC_OP_BINDING_KEY_LIST, 1),
    OFNC("-binding-key-add", "Add an existing key binding. OPT1 = Context, OPT2 = key, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters", 6, _e_opt_binding_key_add, 0),
    OFNC("-binding-key-del", "Delete an existing key binding. OPT1 = Context, OPT2 = key, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters", 6, _e_opt_binding_key_del, 0),
-   ODBL("-menus-click-drag-timeout-set", "Set the time (in seconds) between a mouse press and release that will keep the menu up anyway", E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_SET, 0),
-   OREQ("-menus-click-drag-timeout-get", "Get the above value", E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET, 1),
    OINT("-border-shade-animate-set", "Set the shading animation flag (0/1)", E_IPC_OP_BORDER_SHADE_ANIMATE_SET, 0),
    OREQ("-border-shade-animate-get", "Get the shading animation flag", E_IPC_OP_BORDER_SHADE_ANIMATE_GET, 1),
    OINT("-border-shade-transition-set", "Set the shading animation algorithm (0, 1, 2 or 3)", E_IPC_OP_BORDER_SHADE_TRANSITION_SET, 0),
@@ -1134,15 +1132,6 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
 	       printf("REPLY: %3.3f\n", val);
 	  }
 	break;
-      case E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY:
-	if (e->data)
-	  {
-	     double val;
-	     
-	     if (e_ipc_codec_double_dec(e->data, e->size, &val))
-	       printf("REPLY: %3.3f\n", val);
-	  }
-	break;
       case E_IPC_OP_BORDER_SHADE_ANIMATE_GET_REPLY:
 	if (e->data)
 	  {