diff --git a/data/elementary/themes/edc/elm/cursor.edc b/data/elementary/themes/edc/elm/cursor.edc
index 67e374a8c8..f836f9da4b 100644
--- a/data/elementary/themes/edc/elm/cursor.edc
+++ b/data/elementary/themes/edc/elm/cursor.edc
@@ -98,6 +98,8 @@ group { name: "elm/cursor/hand1/default";
             rel2.offset: 0 0;
          }
       }
+      /* elm.content.hotspot is the old name for the above part */
+      alias: "elm.content.hotspot" "elm.swallow.hotspot";
    }
 }
 
@@ -109,6 +111,8 @@ group { name: "elm/cursor/blank/default";
             max: 1 1;
          }
       }
+      /* elm.content.hotspot is the old name for the above part */
+      alias: "elm.content.hotspot" "elm.swallow.hotspot";
    }
 }
 
@@ -137,6 +141,8 @@ group { name: "elm/cursor/xterm/default";
             rel2.offset: 0 0;
          }
       }
+      /* elm.content.hotspot is the old name for the above part */
+      alias: "elm.content.hotspot" "elm.swallow.hotspot";
       part { name: "shine";
          description { state: "default" 0.0;
             rel1.to: "base";
diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c
index 9ffc4b768a..3bb29bf62e 100644
--- a/src/lib/elementary/els_cursor.c
+++ b/src/lib/elementary/els_cursor.c
@@ -277,7 +277,16 @@ _elm_cursor_obj_add(Evas_Object *obj, Elm_Cursor *cur)
                                   _elm_cursor_hot_change, cur);
    evas_object_event_callback_add(cur->hotobj, EVAS_CALLBACK_RESIZE,
                                   _elm_cursor_hot_change, cur);
-   edje_object_part_swallow(cur->obj, "elm.swallow.hotspot", cur->hotobj);
+   if (edje_object_part_exists(cur->obj, "elm.swallow.hotspot"))
+     edje_object_part_swallow(cur->obj, "elm.swallow.hotspot", cur->hotobj);
+   else if (edje_object_part_exists(cur->obj, "elm.content.hotspot"))
+     edje_object_part_swallow(cur->obj, "elm.content.hotspot", cur->hotobj);
+   else
+     {
+        ELM_SAFE_FREE(cur->hotobj, evas_object_del);
+        ELM_SAFE_FREE(cur->obj, evas_object_del);
+        return EINA_FALSE;
+     }
 
    evas_object_event_callback_add(cur->obj, EVAS_CALLBACK_DEL,
                                   _elm_cursor_obj_del, cur);