diff --git a/hypr/conf/keybindings/default.conf b/hypr/conf/keybindings/default.conf
index 2fbe4e1..c54b8f8 100644
--- a/hypr/conf/keybindings/default.conf
+++ b/hypr/conf/keybindings/default.conf
@@ -35,7 +35,7 @@ bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
 bind = $mainMod CTRL, Q, exec, wlogout
 bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
 bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
-bind = $mainMod CTRL, RETURN, exec, rofi -show drun
+bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
 bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
 bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
 bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
diff --git a/hypr/scripts/keybindings.sh b/hypr/scripts/keybindings.sh
index 5b390e4..c66afb6 100755
--- a/hypr/scripts/keybindings.sh
+++ b/hypr/scripts/keybindings.sh
@@ -30,4 +30,5 @@ keybinds=$(echo "$keybinds" | sed 's/$mainMod/SUPER/g'|  sed 's/,\([^,]*\)$/ = \
 # ----------------------------------------------------- 
 # Show keybindings in rofi
 # ----------------------------------------------------- 
+sleep 0.2
 rofi -dmenu -i -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
\ No newline at end of file
diff --git a/hypr/scripts/wallpaper.sh b/hypr/scripts/wallpaper.sh
index 144fcab..60738d2 100755
--- a/hypr/scripts/wallpaper.sh
+++ b/hypr/scripts/wallpaper.sh
@@ -49,7 +49,7 @@ case $1 in
         selected=$( find "$HOME/wallpaper" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) -exec basename {} \; | sort -R | while read rfile
         do
             echo -en "$rfile\x00icon\x1f$HOME/wallpaper/${rfile}\n"
-        done | rofi -dmenu -replace -config ~/dotfiles/rofi/config-wallpaper.rasi)
+        done | rofi -dmenu -i -replace -config ~/dotfiles/rofi/config-wallpaper.rasi)
         if [ ! "$selected" ]; then
             echo "No wallpaper selected"
             exit
diff --git a/waybar/modules.json b/waybar/modules.json
index d18f24f..5ceab44 100644
--- a/waybar/modules.json
+++ b/waybar/modules.json
@@ -184,7 +184,7 @@
         // START APPS LABEL
         "format": "Apps",
         // END APPS LABEL
-        "on-click": "rofi -show drun -replace",
+        "on-click": "sleep 0.2;rofi -show drun -replace",
         "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
         "tooltip": false
     },
diff --git a/waybar/themeswitcher.sh b/waybar/themeswitcher.sh
index 22255d5..61a1227 100755
--- a/waybar/themeswitcher.sh
+++ b/waybar/themeswitcher.sh
@@ -47,7 +47,7 @@ done
 # Show rofi dialog
 # ----------------------------------------------------- 
 listNames=${listNames::-2}
-choice=$(echo -e "$listNames" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-themes.rasi -no-show-icons -width 30 -p "Themes" -format i)
+choice=$(echo -e "$listNames" | rofi -dmenu -replace -i -config ~/dotfiles/rofi/config-themes.rasi -no-show-icons -width 30 -p "Themes" -format i)
 
 # ----------------------------------------------------- 
 # Set new theme by writing the theme information to ~/.cache/.themestyle.sh