diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf
index 839cb16..fa2a9d8 100644
--- a/.config/hypr/rules.conf
+++ b/.config/hypr/rules.conf
@@ -44,3 +44,6 @@ windowrulev2 = fullscreen, class:(FreeTube)
 #windowrulev2 = nofullscreenrequest, class:(discord)
 
 windowrulev2 = float, class:(com/.https://ultimaker.UltiMaker-Cura), title:(UltiMaker-Cura)
+
+# https://github.com/hyprwm/Hyprland/issues/4257#issuecomment-1879781806
+windowrulev2 = noinitialfocus,class:^jetbrains-(?!toolbox),floating:1
diff --git a/.config/zsh/custom/plugins/atuin/atuin.plugin.zsh b/.config/zsh/custom/plugins/atuin/atuin.plugin.zsh
index fc0733b..b62188f 100644
--- a/.config/zsh/custom/plugins/atuin/atuin.plugin.zsh
+++ b/.config/zsh/custom/plugins/atuin/atuin.plugin.zsh
@@ -12,6 +12,8 @@ _atuin_up_cond() { # first arg is mode (viins or vicmd)
 	ATUIN_UP_COUNT=$(( ATUIN_UP_COUNT + 1 ))
 	if [ $ATUIN_UP_COUNT -gt 3 ]
 	then
+		# TODO: fix when BUFFER changed just before atuin-up-search
+		BUFFER="${BUFFER:0:$__savecursor}"
 		zle "atuin-up-search$1"
 	else
 		zle up-line-or-beginning-search