diff --git a/app/wm.cpp b/app/wm.cpp
index 01a203da..5509483f 100644
--- a/app/wm.cpp
+++ b/app/wm.cpp
@@ -145,9 +145,20 @@ bool WMUtils::isRunningWayland()
     // If the value is not set yet, populate it now.
     int val = SDL_AtomicGet(&isRunningOnWayland);
     if (!(val & VALUE_SET)) {
-        struct wl_display* display = wl_display_connect(nullptr);
-        if (display != nullptr) {
-            wl_display_disconnect(display);
+        struct wl_display* display = nullptr;
+
+        // We need to avoid the default fallback to wayland-0 that wl_display_connect()
+        // will try for cases where we might be running from a TTY with a Wayland
+        // compositor running in another VT that happens to use the wayland-0 name.
+        if (!qEnvironmentVariableIsEmpty("WAYLAND_DISPLAY") ||
+            !qEnvironmentVariableIsEmpty("WAYLAND_SOCKET") ||
+            qgetenv("XDG_SESSION_TYPE") == "wayland") {
+
+            // This looks like it might be a Wayland environment, so give it a shot
+            display = wl_display_connect(nullptr);
+            if (display != nullptr) {
+                wl_display_disconnect(display);
+            }
         }
 
         // Populate the value to return and have for next time.