diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 6986b69030..7bd9c9bd65 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -1041,6 +1041,9 @@ void Launcher::DataFilesPage::reloadCells()
 
     while (true)
     {
+        if (mAbortReloadCells)
+            return;
+
         mStartReloadCells.wait(lock);
 
         if (mAbortReloadCells)
@@ -1071,9 +1074,6 @@ void Launcher::DataFilesPage::reloadCells()
         }
 
         lock.lock();
-
-        if (mAbortReloadCells)
-            return;
     }
 }