diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c
index 71834f924..9b7945b4c 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_FAST_MOVE_THRESHHOLD_SET:
-	if (e_ipc_codec_double_dec(e->data, e->size,
-				   &(e_config->menus_fast_mouse_move_threshhold)))
-	  {
-	     E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
-	     e_config_save_queue();
-	  }
-	break;
-      case E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_GET:
-	_e_ipc_reply_double_send(e->client,
-				 e_config->menus_fast_mouse_move_threshhold, 
-				 E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_GET_REPLY);
-	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)))
diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h
index 317d26bb3..b86eb811c 100644
--- a/src/bin/e_ipc_handlers.h
+++ b/src/bin/e_ipc_handlers.h
@@ -1029,6 +1029,47 @@ break;
    END_INT;
 #endif
 #undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_SET
+#if (TYPE == E_REMOTE_OPTIONS)
+   OP("-menus-fast-move-threshold-set", 1, "Set the mouse speed (pixels/second) that is considered a 'fast move'", 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_fast_mouse_move_threshhold = val;
+   E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
+   SAVE;
+   END_DOUBLE;
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET
+#if (TYPE == E_REMOTE_OPTIONS)
+   OP("-menus-fast-move-threshold-get", 0, "Get the mouse speed (pixels/second) that is considered a 'fast move'", 1, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+   REQ_NULL(HDL);
+#elif (TYPE == E_WM_IN)
+   SEND_DOUBLE(e_config->menus_fast_mouse_move_threshhold, E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET_REPLY, HDL);
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+
+/****************************************************************************/
+#define HDL E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_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_ipc_handlers_list.h b/src/bin/e_ipc_handlers_list.h
index 0d006829c..be0091453 100644
--- a/src/bin/e_ipc_handlers_list.h
+++ b/src/bin/e_ipc_handlers_list.h
@@ -40,9 +40,9 @@
 #define E_IPC_OP_MENUS_SCROLL_SPEED_SET 40
 #define E_IPC_OP_MENUS_SCROLL_SPEED_GET 41
 #define E_IPC_OP_MENUS_SCROLL_SPEED_GET_REPLY 42
-#define E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_SET 43
-#define E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_GET 44
-#define E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_GET_REPLY 45
+#define E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_SET 43
+#define E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET 44
+#define E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET_REPLY 45
 #define E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_SET 46
 #define E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET 47
 #define E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY 48
diff --git a/src/bin/e_remote_main.c b/src/bin/e_remote_main.c
index d31a45819..adc2446aa 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-fast-move-threshhold-set", "Set the mouse speed in pixels per second that is considered a 'fast move'", E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_SET, 0),
-   OREQ("-menus-fast-move-threshhold-get", "Get the mouse speed (pixels/sec) that is considered a fast move", E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_GET, 1),
    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),
@@ -1136,15 +1134,6 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
 	       printf("REPLY: %3.3f\n", val);
 	  }
 	break;
-      case E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_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_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY:
 	if (e->data)
 	  {