diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 2f59dfa..7a9b4ce 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -12,7 +12,7 @@ source:
     - osx-zmq.patch
 
 build:
-  number: 1
+  number: 2
   skip: true  # [osx and arm64 and py < 39]
   entry_points:
     - spyder = spyder.app.start:main
diff --git a/recipe/post-link.sh b/recipe/post-link.sh
index 01345fa..9ea2623 100644
--- a/recipe/post-link.sh
+++ b/recipe/post-link.sh
@@ -7,11 +7,15 @@ menu="${PREFIX}/Menu/spyder-menu.json"
 if [[ -f "${PREFIX}/Menu/conda-based-app" ]]; then
     # Installed in installer environment, abridge shortcut name
     sed "${opts[@]}" "s/ \(\{\{ ENV_NAME \}\}\)//g" $menu
+    sed "${opts[@]}" "s/-__CFBID_ENV__//g" $menu
 
     # Nothing more to do for conda-based-installers
     exit
 fi
 
+env_name=$(basename ${PREFIX//_/-})
+sed "${opts[@]}" "s/__CFBID_ENV__/${env_name}/g" $menu
+
 # Do not create shortcut for menuinst version <2.1.2
 menuinst_version=$($CONDA_PYTHON_EXE -c "import menuinst; print(menuinst.__version__)" 2>/dev/null || echo "0.0.0")
 if [[ "$menuinst_version" < "2.1.2" ]]; then
diff --git a/recipe/spyder-menu.json b/recipe/spyder-menu.json
index 1edc266..6d068d5 100644
--- a/recipe/spyder-menu.json
+++ b/recipe/spyder-menu.json
@@ -16,7 +16,7 @@
             "platforms": {
                 "win": {
                     "desktop": true,
-                    "app_user_model_id": "spyder.Spyder",
+                    "app_user_model_id": "spyder-ide.Spyder-__PKG_MAJOR_VER__.{{ ENV_NAME }}",
                     "command": ["{{ PREFIX }}/Scripts/spyder.exe", "%*"],
                     "file_extensions": [
                         ".enaml",
@@ -33,7 +33,7 @@
                         "Science"
                     ],
                     "command": ["{{ PREFIX }}/bin/spyder", "%F"],
-                    "StartupWMClass": "Spyder",
+                    "StartupWMClass": "Spyder-__PKG_MAJOR_VER__.{{ ENV_NAME }}",
                     "MimeType": [
                         "text/x-python"
                     ]
@@ -45,7 +45,7 @@
                         "{{ PREFIX }}/bin/python": "{{ MENU_ITEM_LOCATION }}/Contents/MacOS/python"
                     },
                     "CFBundleName": "Spyder __PKG_MAJOR_VER__",
-                    "CFBundleIdentifier": "org.spyder-ide.Spyder",
+                    "CFBundleIdentifier": "org.spyder-ide.Spyder-__PKG_MAJOR_VER__-__CFBID_ENV__",
                     "CFBundleVersion": "__PKG_VERSION__",
                     "CFBundleDocumentTypes": [
                         {