diff --git a/awesome/components/pastel/top-panel.lua b/awesome/components/pastel/top-panel.lua
index 45ae36a..c318fef 100644
--- a/awesome/components/pastel/top-panel.lua
+++ b/awesome/components/pastel/top-panel.lua
@@ -130,7 +130,7 @@ top_panel.create = function(s)
     client.connect_signal("focus", change_panel_visibility)
 
     updates_indicator:connect_signal("button::press", function(c, _, _, button)
-        awful.spawn('alacritty -e bash -c "yay ; echo \'\nDone, press any key to exit...\' ; read"')
+        awful.spawn.with_shell('WINIT_X11_SCALE_FACTOR=1 alacritty -e bash -c "yay ; echo \'\nDone, press any key to exit...\' ; read"')
     end)
 
 end
diff --git a/awesome/keys.lua b/awesome/keys.lua
index 11d6087..b1ce26e 100644
--- a/awesome/keys.lua
+++ b/awesome/keys.lua
@@ -143,7 +143,12 @@ keys.globalkeys = gears.table.join(
     -- Spawn terminal
     awful.key({modkey}, "Return",
         function()
-            awful.spawn(apps.terminal)
+            local c = client.focus
+            if c and c.class == "Alacritty" then
+                awful.spawn(string.format("/home/user/.config/awesome/scripts/launch_alacritty.sh %d", c.pid))
+            else
+                awful.spawn(apps.terminal)
+            end
         end,
         {description = "open a terminal", group = "launcher"}
     ),
@@ -178,7 +183,7 @@ keys.globalkeys = gears.table.join(
     -- launch clipman
     awful.key({modkey}, "c",
         function()
-            awful.spawn('bash -c "CM_LAUNCHER=rofi clipmenu"')
+            awful.spawn.with_shell('CM_LAUNCHER=rofi-script rofi -modi "clipmenu:/usr/bin/clipmenu" -show clipmenu')
         end,
         {description = "Clipboard manager", group = "launcher"}
     ),
diff --git a/awesome/scripts/launch_alacritty.sh b/awesome/scripts/launch_alacritty.sh
new file mode 100755
index 0000000..1a1b083
--- /dev/null
+++ b/awesome/scripts/launch_alacritty.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+CHILD_PID=$(pgrep -P $1)
+
+pushd "/proc/$CHILD_PID/cwd"
+SHELL_CWD=$(pwd -P)
+popd
+
+# Start alacritty with the working directory
+alacritty --working-directory $SHELL_CWD
diff --git a/awesome/scripts/toggle_rofi.sh b/awesome/scripts/toggle_rofi.sh
index 39b689d..de8cba4 100755
--- a/awesome/scripts/toggle_rofi.sh
+++ b/awesome/scripts/toggle_rofi.sh
@@ -3,5 +3,5 @@ then
     echo "Already running"
 else
     export TERMINAL=alacritty
-    rofi -show combi -combi-modi drun,calc:~/.config/rofi/show-calculator.sh -sort -levenshtein-sort
+    rofi -show combi -combi-modi drun,calc:~/.config/rofi/show-calculator.sh -sort -levenshtein-sort -matching fuzzy
 fi