diff --git a/src/shell/atuin.nu b/src/shell/atuin.nu
index f9e70ef..c251f6b 100644
--- a/src/shell/atuin.nu
+++ b/src/shell/atuin.nu
@@ -28,10 +28,10 @@ def _atuin_search_cmd [...flags: string] {
     [
         $ATUIN_KEYBINDING_TOKEN,
         ([
-            `commandline (sh -c 'RUST_LOG=error atuin search `,
-            $flags,
-            ` -i -- "$0" 3>&1 1>&2 2>&3' (commandline))`,
-        ] | flatten | str join ''),
+            `commandline (RUST_LOG=error run-external --redirect-stderr atuin search`,
+            ($flags | append [--interactive, --] | each {|e| $'"($e)"'}),
+            `(commandline) | complete | $in.stderr | str substring ',-1')`,
+        ] | flatten | str join ' '),
     ] | str join "\n"
 }