diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 0c4d50df35..89177edd76 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1208,3 +1208,7 @@
 
         * Add the API elm_scroller_page_scroll_limit_set/get.
         It sets the maxium of the movable page at flicking.
+
+2013-04-08  Jaehwan Kim
+
+        * Quit the scroll animator if the scroller don't have a bounce and reach a edge.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index d5e663238b..92d25b4e50 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -198,6 +198,7 @@ Fixes:
    * Fix the elm_shutdown bug in _elm_shutdown_config.
    * Fix box layout bug when items with max size force sizes below minimum.
    * Fix ctxpopup geometry when parent is an elm_win.
+   * Quit the scroll animator if the scroller don't have a bounce and reach a edge.
 
 Removals:
 
diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.c b/legacy/elementary/src/lib/elm_interface_scrollable.c
index 051ff1d67a..c1434e2683 100644
--- a/legacy/elementary/src/lib/elm_interface_scrollable.c
+++ b/legacy/elementary/src/lib/elm_interface_scrollable.c
@@ -1945,12 +1945,13 @@ _elm_scroll_momentum_animator(void *data)
         _elm_scroll_wanted_coordinates_update(sid, x, y);
         eo_do(sid->pan_obj, elm_obj_pan_pos_max_get(&maxx, &maxy));
         eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny));
-        if (!sid->bounce_horiz)
+
+        if (!_elm_config->thumbscroll_bounce_enable || !sid->bounce_horiz)
           {
              if (x <= minx) no_bounce_x_end = EINA_TRUE;
              if ((x - minx) >= maxx) no_bounce_x_end = EINA_TRUE;
           }
-        if (!sid->bounce_vert)
+        if (!_elm_config->thumbscroll_bounce_enable || !sid->bounce_vert)
           {
              if (y <= miny) no_bounce_y_end = EINA_TRUE;
              if ((y - miny) >= maxy) no_bounce_y_end = EINA_TRUE;