diff --git a/client/ui/controllers/focusController.cpp b/client/ui/controllers/focusController.cpp
index e70391a8..682f4b0e 100644
--- a/client/ui/controllers/focusController.cpp
+++ b/client/ui/controllers/focusController.cpp
@@ -88,6 +88,8 @@ FocusController::FocusController(QQmlApplicationEngine* engine, QObject *parent)
 
 void FocusController::nextItem(Direction direction)
 {
+    reload(direction);
+
     if (m_lvfc) {
         direction == Direction::Forward ? focusNextListViewItem() : focusPreviousListViewItem();
         qDebug() << "===>> [handling the ListView]";
@@ -95,15 +97,13 @@ void FocusController::nextItem(Direction direction)
         return;
     }
 
-    reload(direction);
-
     if(m_focusChain.empty()) {
         qWarning() << "There are no items to navigate";
         return;
     }
 
     if (m_focusedItemIndex == (m_focusChain.size() - 1)) {
-        qDebug() << "Last focus index. Making it zero";
+        qDebug() << "Last focus index. Making it zero...";
         m_focusedItemIndex = 0;
     } else {
         qDebug() << "Incrementing focus index";
@@ -222,7 +222,7 @@ void FocusController::setFocusOnDefaultItem()
 
 void FocusController::reload(Direction direction)
 {
-        m_focusChain.clear();
+    m_focusChain.clear();
 
     QObject* rootObject = (m_rootObjects.empty()
                                ? m_engine->rootObjects().value(0)
@@ -232,6 +232,7 @@ void FocusController::reload(Direction direction)
         qCritical() << "No ROOT OBJECT found!";
         m_focusedItemIndex = -1;
         resetRootObject();
+        resetListView();
         setFocusOnDefaultItem();
         return;
     }
@@ -246,6 +247,7 @@ void FocusController::reload(Direction direction)
         qWarning() << "Focus chain is empty!";
         m_focusedItemIndex = -1;
         resetRootObject();
+        resetListView();
         setFocusOnDefaultItem();
         return;
     }
@@ -254,11 +256,20 @@ void FocusController::reload(Direction direction)
 
     if(m_focusedItemIndex == -1) {
         qInfo() << "No focus item in chain.";
+        resetListView();
         setFocusOnDefaultItem();
         return;
     }
 }
 
+void FocusController::resetListView()
+{
+    if(m_lvfc) {
+        delete m_lvfc;
+        m_lvfc = nullptr;
+    }
+}
+
 void FocusController::pushRootObject(QObject* object)
 {
     m_rootObjects.push(object);
diff --git a/client/ui/controllers/focusController.h b/client/ui/controllers/focusController.h
index a4851032..472c328b 100644
--- a/client/ui/controllers/focusController.h
+++ b/client/ui/controllers/focusController.h
@@ -44,6 +44,7 @@ private:
     void focusNextListViewItem();
     void focusPreviousListViewItem();
     void reload(Direction direction);
+    void resetListView();
 
     QSharedPointer<QQmlApplicationEngine> m_engine; // Pointer to engine to get root object
     QList<QObject*> m_focusChain; // List of current objects to be focused