diff --git a/org.mozilla.thunderbird.desktop b/org.mozilla.thunderbird.desktop
new file mode 100644
index 0000000..1945d1e
--- /dev/null
+++ b/org.mozilla.thunderbird.desktop
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Version=1.0
+Name=Thunderbird
+GenericName=Email
+Comment=Send and Receive Email
+Exec=thunderbird %u
+TryExec=thunderbird
+Icon=thunderbird
+Terminal=false
+Type=Application
+MimeType=message/rfc822;x-scheme-handler/mailto;
+StartupNotify=true
+Categories=Network;Email;
+Name[cs]=Poštovní klient Thunderbird
+Name[ca]=Client de correu Thunderbird
+Name[fi]=Thunderbird-sähköposti
+Name[fr]=Messagerie Thunderbird
+Name[pl]=Klient poczty Thunderbird
+Name[pt_BR]=Cliente de E-mail Thunderbird
+Name[sv]=E-postklienten Thunderbird
+Comment[ca]=Llegiu i escriviu correu
+Comment[cs]=Čtení a psaní pošty
+Comment[de]=Emails lesen und verfassen
+Comment[fi]=Lue ja kirjoita sähköposteja
+Comment[fr]=Lire et écrire des courriels
+Comment[it]=Leggere e scrivere email
+Comment[ja]=メールの読み書き
+Comment[pl]=Czytanie i wysyłanie e-maili
+Comment[pt_BR]=Ler e escrever suas mensagens
+Comment[sv]=Läs och skriv e-post
diff --git a/thunderbird.sh.in b/thunderbird.sh.in
index 3299b30..db5e171 100644
--- a/thunderbird.sh.in
+++ b/thunderbird.sh.in
@@ -83,6 +83,12 @@ fi
 
 __WAYLAND_X11_PLACEHOLDER__
 
+# We need to link Firefox with desktop file name
+if [ -z "$MOZ_APP_REMOTINGNAME" ]
+then
+  export MOZ_APP_REMOTINGNAME=__APP_NAME__
+fi
+
 ##
 ## Automatically installed langpacks are tracked by .fedora-langpack-install
 ## config file.
diff --git a/thunderbird.spec b/thunderbird.spec
index 2b9bccf..1993900 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -96,6 +96,7 @@ Source25:       thunderbird-symbolic.svg
 Source28:       thunderbird-wayland.sh.in
 Source29:       thunderbird-wayland.desktop
 Source32:       node-stdout-nonblocking-wrapper
+Source33:       org.mozilla.thunderbird.desktop
 
 # Build patches
 Patch9:         mozilla-build-arm.patch
@@ -558,14 +559,19 @@ done
            %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
 
 
+%if 0%{?fedora} < 40
 desktop-file-install --vendor mozilla \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE20}
 # wayland desktop file only for older fedoras
-%if 0%{?fedora} < 40
 desktop-file-install --vendor mozilla \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE29}
+%else
+#org.mozilla.thunderbird for F40+
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %{SOURCE33}
 %endif
 
 
@@ -577,8 +583,10 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 # Enable wayland by default on f40+
 %if 0%{?fedora} >= 40
 sed -i -e 's,__WAYLAND_X11_PLACEHOLDER__,export MOZ_ENABLE_WAYLAND=1,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird 
+sed -i -e 's,__APP_NAME__,org.mozilla.thunderbird,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird 
 %else
 sed -i -e 's,__WAYLAND_X11_PLACEHOLDER__,,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird 
+sed -i -e 's,__APP_NAME__,mozilla-thunderbird,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird 
 %{__cat} %{SOURCE28} | %{__sed} -e 's,__PREFIX__,%{_prefix},g' > \
         %{buildroot}%{_bindir}/thunderbird-wayland
 %{__chmod} 755 %{buildroot}%{_bindir}/thunderbird-wayland