diff --git a/browser/components/shell/search-provider-files/README b/browser/components/shell/search-provider-files/README
index 81ea16d9b62b..459e012f2a0f 100644
--- a/browser/components/shell/search-provider-files/README
+++ b/browser/components/shell/search-provider-files/README
@@ -1,20 +1,24 @@
 In order to get gnome shell search provider registered and active
-you need to install the firefox-search-provider.ini and firefox.desktop files system wide.
+you need to install the org.mozilla.firefox.search-provider.ini,
+org.mozilla.firefox.SearchProvider.service and firefox.desktop files system wide.
 
 The locations may be distro specific, for instance Fedora and Ubuntu expect
 the files at:
 
-/usr/share/gnome-shell/search-providers/firefox-search-provider.ini
+/usr/share/gnome-shell/search-providers/org.mozilla.firefox.search-provider.ini
+/usr/share/dbus-1/services/org.mozilla.firefox.SearchProvider.service
 /usr/share/applications/firefox.desktop
 
 firefox.desktop is a system-wide Firefox launcher. It may come with your
-distribution or you can use this one. Update name of firefox desktop file at firefox-search-provider.ini
+distribution or you can use this one. Update name of firefox desktop file at org.mozilla.firefox.search-provider.ini
 according your actual file at /usr/share/applications.
 
-firefox-search-provider.ini registers Firefox as a search provider.
+org.mozilla.firefox.search-provider.ini registers Firefox as a search provider.
 When the file is correctly installed you can see Firefox as a searchable application
 at Settings -> Search at Gnome controll center.
 
-Gnome shell search provider is active only when Firefox is running. When it's active
-you can see it as org.mozilla.Firefox.SearchProvider D-Bus service.
+org.mozilla.firefox.SearchProvider.service file makes DBus search provider service
+activatable. Without it thw service is broken, see mzbz#1851393.
 
+Gnome shell search provider is active only when Firefox is running. When it's active
+you can see it as org.mozilla.firefox.SearchProvider D-Bus service.
diff --git a/browser/components/shell/search-provider-files/firefox-search-provider.ini b/browser/components/shell/search-provider-files/firefox-search-provider.ini
deleted file mode 100644
index 3868e3d528d3..000000000000
--- a/browser/components/shell/search-provider-files/firefox-search-provider.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[Shell Search Provider]
-DesktopId=firefox.desktop
-BusName=org.mozilla.Firefox.SearchProvider
-ObjectPath=/org/mozilla/Firefox/SearchProvider
-Version=2
diff --git a/browser/components/shell/search-provider-files/firefox.desktop b/browser/components/shell/search-provider-files/firefox.desktop
index 118aae6b7327..575290acddc3 100644
--- a/browser/components/shell/search-provider-files/firefox.desktop
+++ b/browser/components/shell/search-provider-files/firefox.desktop
@@ -51,6 +51,7 @@ StartupNotify=true
 Categories=Network;WebBrowser;
 Keywords=web;browser;internet;
 Actions=new-window;new-private-window;
+DBusActivatable=true
 
 X-Desktop-File-Install-Version=0.24
 
diff --git a/browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service b/browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service
new file mode 100644
index 000000000000..967b990cc00a
--- /dev/null
+++ b/browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.mozilla.firefox.SearchProvider
+Exec=/usr/bin/firefox
diff --git a/browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini b/browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini
new file mode 100644
index 000000000000..b2a04609486b
--- /dev/null
+++ b/browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini
@@ -0,0 +1,5 @@
+[Shell Search Provider]
+DesktopId=firefox.desktop
+BusName=org.mozilla.firefox.SearchProvider
+ObjectPath=/org/mozilla/firefox/SearchProvider
+Version=2