diff --git a/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.cpp b/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.cpp
index 39d93735..82a9539e 100644
--- a/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.cpp
+++ b/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.cpp
@@ -1,6 +1,5 @@
 #include "data/parser/cxx/CanonicalFilePathCache.h"
 
-#include "utility/file/FilePath.h"
 #include "utility/utilityString.h"
 #include "data/parser/cxx/utilityClang.h"
 
diff --git a/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.h b/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.h
index d58aa936..c6ec1c1e 100644
--- a/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.h
+++ b/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.h
@@ -5,8 +5,7 @@
 #include <unordered_map>
 
 #include "clang/Basic/FileManager.h"
-
-class FilePath;
+#include "utility/file/FilePath.h"
 
 class CanonicalFilePathCache
 {
diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h
index ffbf28bd..bc365b65 100644
--- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h
+++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h
@@ -5,7 +5,6 @@
 #include "data/parser/cxx/name_resolver/CxxNameResolver.h"
 
 class CanonicalFilePathCache;
-class FilePath;
 
 class CxxDeclNameResolver: public CxxNameResolver
 {
diff --git a/src/lib_gui/qt/element/QtSmartSearchBox.cpp b/src/lib_gui/qt/element/QtSmartSearchBox.cpp
index 035b09b0..a02b0ae7 100644
--- a/src/lib_gui/qt/element/QtSmartSearchBox.cpp
+++ b/src/lib_gui/qt/element/QtSmartSearchBox.cpp
@@ -626,6 +626,11 @@ void QtSmartSearchBox::onElementSelected(QtSearchElement* element)
 		return;
 	}
 
+	if (!hasFocus())
+	{
+		setFocus();
+	}
+
 	if (!hasSelectedElements() && !m_shiftKeyDown)
 	{
 		editElement(element);