diff --git a/src/reader.rs b/src/reader.rs
index 01cef7fa8..0945cdf5e 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -3172,7 +3172,8 @@ impl ReaderData {
                 self.parser().libdata_mut().is_repaint = false;
             }
             rl::SelfInsert | rl::SelfInsertNotFirst | rl::FuncAnd | rl::FuncOr => {
-                panic!("should have been handled by inputter_t::readch");
+                // This can be reached via `commandline -f and` etc
+                // panic!("should have been handled by inputter_t::readch");
             }
         }
     }
diff --git a/tests/pexpects/bind.py b/tests/pexpects/bind.py
index 9636a0cf1..75ef600cc 100644
--- a/tests/pexpects/bind.py
+++ b/tests/pexpects/bind.py
@@ -375,6 +375,10 @@ expect_prompt("foobar")
 # This should do nothing instead of crash
 sendline("commandline -f backward-jump")
 expect_prompt()
+sendline("commandline -f self-insert")
+expect_prompt()
+sendline("commandline -f and")
+expect_prompt()
 
 # Check that the builtin version of `exit` works
 # (for obvious reasons this MUST BE LAST)