diff --git a/src/gui/control/item_list.cpp b/src/gui/control/item_list.cpp
index 83dc0437..e3521003 100644
--- a/src/gui/control/item_list.cpp
+++ b/src/gui/control/item_list.cpp
@@ -180,10 +180,10 @@ void ItemList::refreshList(bool refresh_current_only) {
   // refresh
   // Note: Freeze/Thaw makes flicker worse
   long item_count = (long)sorted_list.size();
+  SetItemCount(item_count);
   if (item_count == 0) {
     Refresh();
   } else {
-    SetItemCount(item_count);
     // (re)select current item
     findSelectedItemPos();
     focusNone();