diff --git a/client/cmd/login.go b/client/cmd/login.go
index 065f8553a43..14c973d916a 100644
--- a/client/cmd/login.go
+++ b/client/cmd/login.go
@@ -219,15 +219,5 @@ func openURL(cmd *cobra.Command, verificationURIComplete, userCode string) {
 
 // isLinuxRunningDesktop checks if a Linux OS is running desktop environment
 func isLinuxRunningDesktop() bool {
-	if os.Getenv("DESKTOP_SESSION") != "" {
-		return true
-	}
-
-	for _, env := range os.Environ() {
-		if strings.HasPrefix(env, "XDG_") {
-			return true
-		}
-	}
-
-	return false
+	return os.Getenv("DESKTOP_SESSION") != "" || os.Getenv("XDG_CURRENT_DESKTOP") != ""
 }
diff --git a/client/cmd/login_test.go b/client/cmd/login_test.go
index 45f342b9dd3..6bb7eff4f8a 100644
--- a/client/cmd/login_test.go
+++ b/client/cmd/login_test.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -52,16 +51,3 @@ func TestLogin(t *testing.T) {
 		t.Errorf("expected non empty Private key, got empty")
 	}
 }
-
-func TestIsLinuxRunningDesktop(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.Skip("skipping test on non-linux platform")
-	}
-
-	t.Setenv("XDG_FOO", "BAR")
-
-	isDesktop := isLinuxRunningDesktop()
-	if !isDesktop {
-		t.Errorf("expected desktop environment, got false")
-	}
-}