diff --git a/src/shell-util.c b/src/shell-util.c
index 3f91d547d..00e3aa16c 100644
--- a/src/shell-util.c
+++ b/src/shell-util.c
@@ -635,7 +635,8 @@ shell_util_systemd_call (const char           *command,
    */
   res = sd_pid_get_user_unit (getpid (), &self_unit);
 
-  if (res == -ENODATA)
+  if (res == -ENODATA ||
+      (res >= 0 && !g_str_has_prefix (self_unit, "org.gnome.Shell")))
     {
       g_task_return_new_error (task,
                                G_IO_ERROR,