diff --git a/internal/view/cmd/interpreter.go b/internal/view/cmd/interpreter.go
index 89f2783b..b42dac35 100644
--- a/internal/view/cmd/interpreter.go
+++ b/internal/view/cmd/interpreter.go
@@ -39,12 +39,7 @@ func (c *Interpreter) ClearNS() {
 
 // SwitchNS replaces the current namespace with the provided one.
 func (c *Interpreter) SwitchNS(ns string) {
-	if !c.HasNS() {
-		c.Reset(c.line + " " + ns)
-	}
-	if ons, ok := c.NSArg(); ok {
-		c.Reset(strings.TrimSpace(strings.Replace(c.line, ons, ns, 1)))
-	}
+	c.args[nsKey] = ns
 }
 
 func (c *Interpreter) grok() {