diff --git a/data/settings.desktop.in b/data/settings.desktop.in
index 21ac4aaa..827fbfce 100644
--- a/data/settings.desktop.in
+++ b/data/settings.desktop.in
@@ -3,12 +3,13 @@ Type=Application
 
 Name=System Settings
 Comment=Change system and user settings
-Categories=GNOME;GTK;System;
+Categories=GTK;System;
 Keywords=Center;Control;Panel;Preferences;System;
 
 Icon=io.elementary.settings
 Exec=io.elementary.settings %u
 DBusActivatable=true
+OnlyShowIn=Pantheon;
 SingleMainWindow=true
 StartupNotify=true
 Terminal=false
diff --git a/src/Application.vala b/src/Application.vala
index 5e4d97f5..f6111c3a 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -261,6 +261,11 @@ namespace Switchboard {
         }
 
         public static int main (string[] args) {
+            if (GLib.Environment.get_variable ("XDG_CURRENT_DESKTOP") != "Pantheon") {
+                critical ("System Settings can only be run in a Pantheon desktop session");
+                return 1;
+            }
+
             var app = new SwitchboardApp ();
             return app.run (args);
         }