diff --git a/src/blackmisc/directoryutils.cpp b/src/blackmisc/directoryutils.cpp
index cb46a2a79..1b8482abc 100644
--- a/src/blackmisc/directoryutils.cpp
+++ b/src/blackmisc/directoryutils.cpp
@@ -51,7 +51,7 @@ namespace BlackMisc
         Q_ASSERT_X(CBuildConfig::isKnownExecutableName(executable), Q_FUNC_INFO, "Unknown exectuable");
 
         QString s = CFileUtils::appendFilePaths(CDirectoryUtils::binDirectory(), executable);
-        if (CBuildConfig::isRunningOnMacOSXPlatform() && CDirectoryUtils::isMacOSXAppBundle())
+        if (CDirectoryUtils::isMacOSXAppBundle())
         {
             s += QLatin1String(".app/Contents/MacOS/") + executable;
         }
@@ -123,25 +123,19 @@ namespace BlackMisc
         return p;
     }
 
-    bool isAppBundleImpl()
-    {
-        QDir bundleDir(CDirectoryUtils::binDirectory());
-        bundleDir.cd("../..");
-        const bool isBundled = QFileInfo(bundleDir.absolutePath()).isBundle();
-        return isBundled;
-    }
-
     QString getSwiftShareDirImpl()
     {
         QDir dir(CDirectoryUtils::binDirectory());
         bool success = true;
 
-        static const bool appBundle = isAppBundleImpl();
-        if (CBuildConfig::isRunningOnMacOSXPlatform() && appBundle)
+        if (CDirectoryUtils::isMacOSXAppBundle())
         {
             success = dir.cd("../../../../share");
         }
-        else { success = dir.cd("../share"); }
+        else
+        {
+            success = dir.cd("../share");
+        }
 
         if (success)
         {
diff --git a/src/blackmisc/directoryutils.h b/src/blackmisc/directoryutils.h
index bd5755293..701b5bf33 100644
--- a/src/blackmisc/directoryutils.h
+++ b/src/blackmisc/directoryutils.h
@@ -46,6 +46,10 @@ namespace BlackMisc
         //! swift application data sub directories
         static QStringList applicationDataDirectoryList(bool withoutCurrent = false, bool beautify = false);
 
+        //! Is MacOSX application bundle?
+        //! \remark: Means the currently running executable is a MacOSX bundle, but not all our executables are bundles on MacOSX
+        static bool isMacOSXAppBundle();
+
         //! swift application data directory for one specific installation (a version)
         static const QString &normalizedApplicationDataDirectory();