diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt
index b4247018c1002dbfc4035c209c409803405b11e1..9b9c5ad1716be4b45c6e4a00013490c89a84da99 100644
--- a/Applications/CMakeLists.txt
+++ b/Applications/CMakeLists.txt
@@ -7,5 +7,4 @@ ENDIF() # OGS_BUILD_UTILS AND NOT IS_SUBPROJECT
 IF(OGS_BUILD_GUI)
 	ADD_DEFINITIONS(-DOGS_BUILD_GUI)
 	ADD_SUBDIRECTORY(DataExplorer)
-	ADD_SUBDIRECTORY(Utils/OGSFileConverter)
 ENDIF() # OGS_BUILD_GUI
diff --git a/Applications/Utils/CMakeLists.txt b/Applications/Utils/CMakeLists.txt
index 363765401e0a32730b59c4e7408d45296e6e68e3..333890eabce7f2c1a046f73a3e935fb61d9c0323 100644
--- a/Applications/Utils/CMakeLists.txt
+++ b/Applications/Utils/CMakeLists.txt
@@ -1,3 +1,7 @@
 ADD_SUBDIRECTORY( FileConverter )
 ADD_SUBDIRECTORY( MeshEdit )
 ADD_SUBDIRECTORY( SimpleMeshCreation )
+
+IF(OGS_BUILD_GUI)
+	ADD_SUBDIRECTORY(OGSFileConverter)
+ENDIF() # OGS_BUILD_GUI
diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index af3d891b0e484b6d216ba0509f636fb86e524ff0..7f4f3c5eb6ec05854edaf7bd9558304711dfec55 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -88,6 +88,8 @@ set ( CMAKE_CONFIGURATION_TYPES "Release;Debug" CACHE TYPE INTERNAL FORCE )
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
 set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
 
+SET_PROPERTY(TARGET OGSFileConverter PROPERTY FOLDER "Utilities")
+
 ####################
 ### Installation ###
 ####################