diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
index 1c1e7d950..be2002504 100644
--- a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
+++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
@@ -133,7 +133,6 @@ public class SQLiteHabitList extends HabitList
         return Collections.unmodifiableCollection(toList()).iterator();
     }
 
-    @Deprecated
     public void rebuildOrder()
     {
         List<Habit> habits = toList();
@@ -176,7 +175,7 @@ public class SQLiteHabitList extends HabitList
     }
 
     @Override
-    public void reorder(Habit from, Habit to)
+    public synchronized void reorder(Habit from, Habit to)
     {
         if (from == to) return;
 
@@ -213,6 +212,7 @@ public class SQLiteHabitList extends HabitList
         fromRecord.save();
 
         update(from);
+        rebuildOrder();
 
         getObservable().notifyListeners();
     }