diff --git a/legacy/elementary/data/themes/widgets/index.edc b/legacy/elementary/data/themes/widgets/index.edc
index 40a0494549..0224490b24 100644
--- a/legacy/elementary/data/themes/widgets/index.edc
+++ b/legacy/elementary/data/themes/widgets/index.edc
@@ -49,7 +49,7 @@ group { name: "elm/index/base/vertical/default";
       }
       part { name: "button_image";
          mouse_events: 1;
-         clip_to: "clip";
+         clip_to: "clip2";
          description { state: "default" 0.0;
             rel1 {
                to: "elm.text.body";
@@ -71,7 +71,7 @@ group { name: "elm/index/base/vertical/default";
          effect: SOFT_SHADOW;
          mouse_events: 0;
          scale: 1;
-         clip_to: "clip";
+         clip_to: "clip2";
          description { state: "default" 0.0;
             align: 1.0 0.5;
             fixed: 1 1;
@@ -100,7 +100,7 @@ group { name: "elm/index/base/vertical/default";
          effect: SOFT_SHADOW;
          mouse_events: 0;
          scale: 1;
-         clip_to: "clip";
+         clip_to: "clip2";
          description { state: "default" 0.0;
             align: 1.0 0.5;
             fixed: 1 1;
@@ -128,7 +128,7 @@ group { name: "elm/index/base/vertical/default";
       }
       part {        name: "over1";
          mouse_events: 0;
-         clip_to: "clip";
+         clip_to: "clip2";
          description { state: "default" 0.0;
             rel1 {
                to: "button_image";
@@ -147,7 +147,7 @@ group { name: "elm/index/base/vertical/default";
          mouse_events: 1;
          repeat_events: 1;
          ignore_flags: ON_HOLD;
-         clip_to: "clip";
+         clip_to: "clip2";
          description { state: "default" 0.0;
             rel1 {
                to: "button_image";
@@ -215,6 +215,20 @@ group { name: "elm/index/base/vertical/default";
          transition: DECELERATE 0.5;
          target: "clip";
       }
+      program { name: "active2";
+         signal: "elm,indicator,state,active";
+         source: "elm";
+         action: STATE_SET "active" 0.0;
+         transition: DECELERATE 0.5;
+         target: "clip2";
+      }
+      program { name: "inactive2";
+         signal: "elm,indicator,state,inactive";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.5;
+         target: "clip2";
+      }
    }
 }
 
diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c
index e930cd6f19..2cea5f2f39 100644
--- a/legacy/elementary/src/bin/test.c
+++ b/legacy/elementary/src/bin/test.c
@@ -278,6 +278,7 @@ my_win_main(char *autorun, Eina_Bool test_win_only)
    evas_object_smart_callback_add(idx, "delay,changed", index_changed, NULL);
    evas_object_size_hint_weight_set(idx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, idx);
+   elm_index_active_set(idx, EINA_TRUE);
    evas_object_show(idx);
 
    tests = NULL;
diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c
index 09f2f206bd..68994f8c89 100644
--- a/legacy/elementary/src/lib/elm_index.c
+++ b/legacy/elementary/src/lib/elm_index.c
@@ -442,6 +442,7 @@ _mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *eve
    _sel_eval(data, ev->canvas.x, ev->canvas.y);
    edje_object_part_drag_value_set(wd->base, "elm.dragable.pointer",
                                    (!edje_object_mirrored_get(wd->base)) ? wd->dx : (wd->dx - w), wd->dy);
+   edje_object_signal_emit(wd->base, "elm,indicator,state,active", "elm");
 }
 
 static void
@@ -457,6 +458,7 @@ _mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event
    if (d) evas_object_smart_callback_call(data, SIG_SELECTED, d);
    elm_index_active_set(data, 0);
    edje_object_signal_emit(wd->base, "elm,state,level,0", "elm");
+   edje_object_signal_emit(wd->base, "elm,indicator,state,inactive", "elm");
 }
 
 static void