diff --git a/data/meson.build b/data/meson.build
index d2e9c217..3cea6964 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -6,6 +6,14 @@ install_data(
     rename: meson.project_name() + '.gschema.xml'
 )
 
+configure_file(
+    input: 'settings.service.in',
+    output: meson.project_name() + '.service',
+    configuration: conf_data,
+    install_dir: get_option('datadir') / 'dbus-1' / 'services',
+    install: true
+)
+
 i18n.merge_file(
     input: 'settings.desktop.in',
     output: meson.project_name() + '.desktop',
diff --git a/data/settings.desktop.in b/data/settings.desktop.in
index 02907e94..8146a005 100644
--- a/data/settings.desktop.in
+++ b/data/settings.desktop.in
@@ -1,11 +1,16 @@
 [Desktop Entry]
 Type=Application
+
 Name=System Settings
 Comment=Change system and user settings
-Exec=io.elementary.settings %u
-Icon=io.elementary.settings
-Terminal=false
-StartupNotify=true
 Categories=GNOME;GTK;System;
 Keywords=Center;Control;Panel;Preferences;System;
+
+Icon=io.elementary.settings
+Exec=io.elementary.settings %u
+DBusActivatable=true
+SingleMainWindow=true
+StartupNotify=true
+Terminal=false
+
 MimeType=x-scheme-handler/settings;
diff --git a/data/settings.service.in b/data/settings.service.in
new file mode 100644
index 00000000..9aa6d131
--- /dev/null
+++ b/data/settings.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=io.elementary.settings
+Exec=@BINDIR@/io.elementary.settings --gapplication-service
diff --git a/meson.build b/meson.build
index 153d0cc6..65a8c5ce 100644
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,7 @@ add_project_arguments([
 )
 
 conf_data = configuration_data()
+conf_data.set('BINDIR', get_option('bindir'))
 conf_data.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
 conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf_file = configure_file(