diff --git a/src/main.rs b/src/main.rs
index 047b4da..c58f5fb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -566,9 +566,9 @@ fn rearrange_workspaces(stream: &UnixStream) {
         send_command(stream, &focus_cmd);
 
         let output_index = workspace.num / 10;
-        if output_index <= outputs.len() {
+        if output_index <= outputs.len() - 1 {
             let mut move_cmd = move_cmd_prefix.clone();
-            move_cmd.push_str(&outputs[output_index - 1].name);
+            move_cmd.push_str(&outputs[output_index.max(1) - 1].name);
             send_command(stream, &move_cmd);
         }
     }