diff --git a/data/themes/default_border.edc b/data/themes/default_border.edc
index ace023677..5d606d864 100644
--- a/data/themes/default_border.edc
+++ b/data/themes/default_border.edc
@@ -1136,7 +1136,7 @@ group {
 	 name:    "menu_action_icon4";
 	 signal:  "mouse,down,1";
 	 source:  "icon";
-	 action:  SIGNAL_EMIT "drag" "start";
+	 action:  SIGNAL_EMIT "drag" "icon";
       }
       program {
 	  name:    "menu_action_title3";
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 958552726..b4938c283 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -1954,10 +1954,13 @@ _e_border_cb_signal_drag(void *data, Evas_Object *obj, const char *emission, con
 {
    E_Border *bd;
 
-   bd = data;
-   bd->drag.start = 1;
-   bd->drag.x = -1;
-   bd->drag.y = -1;
+   if (!strcmp(source, "icon"))
+     {
+	bd = data;
+	bd->drag.start = 1;
+	bd->drag.x = -1;
+	bd->drag.y = -1;
+     }
 }
 
 static int