diff --git a/client/ui/controllers/focusController.cpp b/client/ui/controllers/focusController.cpp
index f43a8693..dc5b95c0 100644
--- a/client/ui/controllers/focusController.cpp
+++ b/client/ui/controllers/focusController.cpp
@@ -1,5 +1,5 @@
 #include "focusController.h"
-#include "utils/focusControl.h"
+#include "utils/qmlUtils.h"
 
 #include <QQmlApplicationEngine>
 #include <QQuickWindow>
@@ -60,11 +60,11 @@ void FocusController::setFocusItem(QQuickItem *item)
 {
     if (m_focusedItem != item) {
         m_focusedItem = item;
-        emit focusedItemChanged();
         qDebug() << "===>> FocusItem is changed to " << item << "!";
     } else {
         qDebug() << "===>> FocusItem is is the same: " << item << "!";
     }
+    emit focusedItemChanged();
 }
 
 void FocusController::setFocusOnDefaultItem()
diff --git a/client/ui/controllers/listViewFocusController.cpp b/client/ui/controllers/listViewFocusController.cpp
index 28d23d4d..574b3c9c 100644
--- a/client/ui/controllers/listViewFocusController.cpp
+++ b/client/ui/controllers/listViewFocusController.cpp
@@ -1,5 +1,5 @@
 #include "listViewFocusController.h"
-#include "utils/focusControl.h"
+#include "utils/qmlUtils.h"
 
 #include <QQuickWindow>
 
diff --git a/client/utils/focusControl.cpp b/client/utils/qmlUtils.cpp
similarity index 97%
rename from client/utils/focusControl.cpp
rename to client/utils/qmlUtils.cpp
index a3107d55..f205f615 100644
--- a/client/utils/focusControl.cpp
+++ b/client/utils/qmlUtils.cpp
@@ -1,5 +1,4 @@
-#include "focusControl.h"
-#include "utils/focusControl.h"
+#include "qmlUtils.h"
 
 #include <QPointF>
 #include <QQuickItem>
diff --git a/client/utils/focusControl.h b/client/utils/qmlUtils.h
similarity index 100%
rename from client/utils/focusControl.h
rename to client/utils/qmlUtils.h