diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 53a38a006..27cbad661 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -174,12 +174,18 @@ endif()
 
 
 # Install other dependencies
-if(WIN32 OR (APPLE AND NOT QT))
+if(WIN32)
     install(CODE "
         include(BundleUtilities)
         get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE)
         fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/$<TARGET_FILE_NAME:86Box>\" \"\" \"\")"
     COMPONENT Runtime)
+elseif(APPLE AND NOT QT)
+    install(CODE "
+        include(BundleUtilities)
+        get_filename_component(CMAKE_INSTALL_PREFIX_ABSOLUTE \${CMAKE_INSTALL_PREFIX} ABSOLUTE)
+        fixup_bundle(\"\${CMAKE_INSTALL_PREFIX_ABSOLUTE}/86Box.app\" \"\" \"\")"
+    COMPONENT Runtime)
 endif()
 
 
diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
index 643e7ece7..9bae270ab 100644
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -208,7 +208,7 @@ macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var _prefix)
 endmacro()
 
 if (APPLE AND CMAKE_MACOSX_BUNDLE)
-    set(prefix "$<TARGET_FILE_NAME:86Box>/Contents")
+    set(prefix "86Box.app/Contents")
     set(INSTALL_RUNTIME_DIR "${prefix}/MacOS")
     set(INSTALL_CMAKE_DIR "${prefix}/Resources")
 
@@ -228,7 +228,7 @@ if (APPLE AND CMAKE_MACOSX_BUNDLE)
         DESTINATION "${INSTALL_CMAKE_DIR}")
 
     # Note Mac specific extension .app
-    set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/$<TARGET_FILE_NAME:86Box>")
+    set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/86Box.app")
 
     # Directories to look for dependencies
     set(DIRS "${CMAKE_BINARY_DIR}")