diff --git a/apps/waybar/default.nix b/apps/waybar/default.nix
index e810f37..7201007 100644
--- a/apps/waybar/default.nix
+++ b/apps/waybar/default.nix
@@ -118,7 +118,6 @@ in {
           format-icons = {
             "music" = "󰎆";
             "gaming" = "󰊖";
-            "steam" = "󰓓";
             "default" = "";
             "active" = "󱓻";
 
@@ -164,13 +163,15 @@ in {
           show-special = true;
           special-visible-only = true;
           all-outputs = true;
-          ignore-workspaces = ["^([0-9]+|gaming|steam|music)$"];
+          ignore-workspaces = ["^([0-9]+|gaming|music)$"];
           format = "{icon}";
           format-icons = {
             "special:youtube" = "󰗃";
+            "special:steam" = "󰓓";
             "special:custom" = "󱗼";
             "special:preload" = "󱗼";
             "youtube" = "󰗃";
+            "steam" = "󰓓";
             "custom" = "󱗼";
             "preload" = "󱗼";
             "default" = "󱗼";
diff --git a/modules/home/gaming.nix b/modules/home/gaming.nix
index 7b31d76..e92969e 100644
--- a/modules/home/gaming.nix
+++ b/modules/home/gaming.nix
@@ -61,26 +61,22 @@ in {
   wayland.windowManager.hyprland.settings = {
     workspace = [
       "name:gaming, monitor:0, default:true"
-      "name:steam, monitor:0, default:true"
     ];
 
     exec-once = [
-      # No longer launching steam on startup
-      # "[workspace special:steam silent] uwsm app -- steam"
+      "[workspace special:steam silent] uwsm app -- steam"
     ];
 
     bindd = [
-      # "SUPER, A, Toggle Steam, togglespecialworkspace, steam"
-      # "SUPER SHIFT, A, Move to Steam Special Workspace, movetoworkspace, special:steam"
+      "SUPER, A, Toggle Steam, togglespecialworkspace, steam"
+      "SUPER SHIFT, A, Move to Steam Special Workspace, movetoworkspace, special:steam"
       "SUPER, G, Switch to Gaming Workspace, workspace, name:gaming"
-      "SUPER, A, Switch to Steam Workspace, workspace, name:steam"
     ];
 
     windowrulev2 =
       [
         # --- STEAM LAUNCHER RULES ---
-        "workspace name:steam, class:^(steam)$"
-        # "workspace special:steam silent, class:^(steam)$"
+        "workspace special:steam silent, class:^(steam)$"
         "noinitialfocus, class:^(steam)$"
         "suppressevent activate, class:^(steam)$"
       ]