diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 6e5f9c5a13..2298ce9948 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -1198,10 +1198,10 @@ elm_scroller_movement_block_set(Evas_Object *obj,
    Efl_Ui_Scroll_Block mode = EFL_UI_SCROLL_BLOCK_NONE;
 
    // legacy -> eo
-   if (block & ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL)
-     mode |= EFL_UI_SCROLL_BLOCK_HORIZONTAL;
-   if (block & ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL)
-     mode |= EFL_UI_SCROLL_BLOCK_VERTICAL;
+   if (block == ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL)
+     mode = EFL_UI_SCROLL_BLOCK_HORIZONTAL;
+   else if (block == ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL)
+     mode = EFL_UI_SCROLL_BLOCK_VERTICAL;
 
    elm_interface_scrollable_movement_block_set(obj, mode);
 }
@@ -1209,7 +1209,6 @@ elm_scroller_movement_block_set(Evas_Object *obj,
 EAPI Elm_Scroller_Movement_Block
 elm_scroller_movement_block_get(const Evas_Object *obj)
 {
-   Elm_Scroller_Movement_Block block = ELM_SCROLLER_MOVEMENT_NO_BLOCK;
    Efl_Ui_Scroll_Block mode;
 
    ELM_SCROLLABLE_CHECK(obj, ELM_SCROLLER_MOVEMENT_NO_BLOCK);
@@ -1217,12 +1216,12 @@ elm_scroller_movement_block_get(const Evas_Object *obj)
    mode = elm_interface_scrollable_movement_block_get(obj);
 
    // eo -> legacy
-   if (mode & EFL_UI_SCROLL_BLOCK_HORIZONTAL)
-     block |= ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL;
-   if (mode & EFL_UI_SCROLL_BLOCK_VERTICAL)
-     block |= ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL;
+   if (mode == EFL_UI_SCROLL_BLOCK_HORIZONTAL)
+     return ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL;
+   else if (mode == EFL_UI_SCROLL_BLOCK_VERTICAL)
+     return ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL;
 
-   return block;
+   return ELM_SCROLLER_MOVEMENT_NO_BLOCK;
 }
 
 EAPI void