diff --git a/home-manager/features/eww/config/scripts/active-workspace.sh b/home-manager/features/eww/config/scripts/active-workspace.sh
index 9c4c62e..71f198a 100755
--- a/home-manager/features/eww/config/scripts/active-workspace.sh
+++ b/home-manager/features/eww/config/scripts/active-workspace.sh
@@ -5,8 +5,7 @@ set -e
 
 handle_event() {
   case $1 in
-    focusedmon*) active_workspace;;
-    workspace*) active_workspace;;
+    focusedmon* | workspace*) active_workspace;;
   esac
 }
 
diff --git a/home-manager/features/eww/config/scripts/workspaces.sh b/home-manager/features/eww/config/scripts/workspaces.sh
index 441e50f..dc744c1 100755
--- a/home-manager/features/eww/config/scripts/workspaces.sh
+++ b/home-manager/features/eww/config/scripts/workspaces.sh
@@ -12,8 +12,8 @@ handle_event() {
 }
 
 list_workspaces() {
-  focused=`hyprctl activeworkspace -j | jq '.id'`
-  active=`hyprctl monitors -j | jq 'map(select(.name == "'$monitor'")) | .[0].activeWorkspace.id'`
+  focused=$(hyprctl activeworkspace -j | jq '.id')
+  active=$(hyprctl monitors -j | jq 'map(select(.name == "'$monitor'")) | .[0].activeWorkspace.id')
   # Explanation
   # 1. Select only workspaces on the current monitor.
   # 2. Remove duplicates (might be a bug with split-monitor-workspaces