diff --git a/src/input.cpp b/src/input.cpp
index 237cf0274..eef039c97 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -752,12 +752,12 @@ char_event_t inputter_t::read_char(const command_handler_t &command_handler) {
                 }
                 case readline_cmd_t::func_and:
                 case readline_cmd_t::func_or: {
-                    // If previous function has right status, we keep reading tokens
+                    // If previous function has correct status, we keep reading tokens
                     if (evt.get_readline() == readline_cmd_t::func_and) {
-                        if (function_status_) return readch();
+                        // Don't return immediately, we might need to handle it here - like self-insert.
+                        if (function_status_) continue;
                     } else {
-                        assert(evt.get_readline() == readline_cmd_t::func_or);
-                        if (!function_status_) return readch();
+                        if (!function_status_) continue;
                     }
                     // Else we flush remaining tokens
                     do {
diff --git a/tests/pexpects/bind.py b/tests/pexpects/bind.py
index f45f7e84b..cb980749e 100644
--- a/tests/pexpects/bind.py
+++ b/tests/pexpects/bind.py
@@ -292,6 +292,16 @@ send("echo git@github.com:fish-shell/fish-shell")
 send("\x17\x17\x17\r")
 expect_prompt("git@", unmatched="ctrl-w does not stop at @")
 
+sendline("abbr --add foo 'echo foonanana'")
+expect_prompt()
+sendline("bind ' ' expand-abbr or self-insert")
+expect_prompt()
+send("foo ")
+expect_str("echo foonanana")
+send(" banana\r")
+expect_str(" banana\r")
+expect_prompt("foonanana banana")
+
 # Ensure that nul can be bound properly (#3189).
 send("bind -k nul 'echo nul seen'\r")
 expect_prompt()