diff --git a/man/waybar-sway-workspaces.5.scd b/man/waybar-sway-workspaces.5.scd
index 25b59eb9e..2347cc394 100644
--- a/man/waybar-sway-workspaces.5.scd
+++ b/man/waybar-sway-workspaces.5.scd
@@ -78,6 +78,10 @@ Addressed by *sway/workspaces*
 	typeof: bool ++
 	Whether to disable *workspace_auto_back_and_forth* when clicking on workspaces. If this is set to *true*, clicking on a workspace you are already on won't do anything, even if *workspace_auto_back_and_forth* is enabled in the Sway configuration.
 
+*no-switch-output*: ++
+	typeof: bool ++
+	Whether to disable switching output when clicking on workspaces. If this is set to *true*, then clicking on a workspace on a different output will bring it to the current output instead of switching to that output.
+
 *alphabetical_sort*: ++
 	typeof: bool ++
 	Whether to sort workspaces alphabetically. Please note this can make "swaymsg workspace prev/next" move to workspaces inconsistent with the ordering shown in Waybar.
diff --git a/src/modules/sway/workspaces.cpp b/src/modules/sway/workspaces.cpp
index 86e7349eb..608ecf015 100644
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@@ -369,11 +369,20 @@ Gtk::Button &Workspaces::addButton(const Json::Value &node) {
                                    node["name"].asString(), node["target_output"].asString(),
                                    "--no-auto-back-and-forth", node["name"].asString()));
         } else {
-          ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace {} \"{}\"",
-                                                config_["disable-auto-back-and-forth"].asBool()
-                                                    ? "--no-auto-back-and-forth"
-                                                    : "",
-                                                node["name"].asString()));
+          if (config_["no-switch-output"].asBool()) {
+            ipc_.sendCmd(IPC_COMMAND, fmt::format("[workspace=\"^{}$\"] move workspace to output current; workspace number {} \"{}\"",
+                                                  node["name"].asString(),
+                                                  config_["disable-auto-back-and-forth"].asBool()
+                                                      ? "--no-auto-back-and-forth"
+                                                      : "",
+                                                  node["name"].asString()));
+          } else {
+            ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace {} \"{}\"",
+                                                  config_["disable-auto-back-and-forth"].asBool()
+                                                      ? "--no-auto-back-and-forth"
+                                                      : "",
+                                                  node["name"].asString()));
+          }
         }
       } catch (const std::exception &e) {
         spdlog::error("Workspaces: {}", e.what());