diff --git a/dotfiles/config/waybar/config.jsonc b/dotfiles/config/waybar/config.jsonc
index 41613af2..2a9d45e4 100644
--- a/dotfiles/config/waybar/config.jsonc
+++ b/dotfiles/config/waybar/config.jsonc
@@ -3,7 +3,7 @@
     "height": 30,
     "spacing": 4,
     "modules-left": [
-        "hyprland/workspaces",
+        "wlr/taskbar",
         "hyprland/submap"
     ],
     "modules-center": [
@@ -81,5 +81,15 @@
         "format-source": "MIC {volume}%",
         "format-source-muted": "MIC muted",
         "on-click": "pavucontrol"
+    },
+    "wlr/taskbar": {
+        "format": "{icon}",
+        "icon-size": 16,
+        "tooltip-format": "{title}",
+        "on-click": "activate",
+        "on-click-middle": "close",
+        "ignore-list": [
+            "waybar"
+        ]
     }
 }
diff --git a/dotfiles/config/waybar/style.css b/dotfiles/config/waybar/style.css
index 7e830285..3e114aa7 100644
--- a/dotfiles/config/waybar/style.css
+++ b/dotfiles/config/waybar/style.css
@@ -53,22 +53,27 @@ button:hover {
     background-color: #a37800;
 }
 
-#workspaces button {
+#workspaces button,
+#taskbar button {
     padding: 0 5px;
     background-color: transparent;
     color: #ffffff;
 }
 
-#workspaces button:hover {
+#workspaces button:hover,
+#taskbar button:hover {
     background: rgba(0, 0, 0, 0.2);
 }
 
-#workspaces button.focused {
+#workspaces button.focused,
+#taskbar button.active,
+#taskbar button.focused {
     background-color: #64727D;
     box-shadow: inset 0 -3px #ffffff;
 }
 
-#workspaces button.urgent {
+#workspaces button.urgent,
+#taskbar button.urgent {
     background-color: #eb4d4b;
 }
 
@@ -99,17 +104,20 @@ button:hover {
 }
 
 #window,
-#workspaces {
+#workspaces,
+#taskbar {
     margin: 0 4px;
 }
 
 /* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
+.modules-left > widget:first-child > #workspaces,
+.modules-left > widget:first-child > #taskbar {
     margin-left: 0;
 }
 
 /* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
+.modules-right > widget:last-child > #workspaces,
+.modules-right > widget:last-child > #taskbar {
     margin-right: 0;
 }