diff --git a/scripts/embellish.py b/scripts/embellish.py
index e7e1820..ada3f8d 100644
--- a/scripts/embellish.py
+++ b/scripts/embellish.py
@@ -110,8 +110,8 @@ def cb_embellish(data, mod, buf, input):
 	if not input:
 		return input
 
-	if input != "/" and input.startswith("/") and input.split(" ",
-	 1)[0].split("\n", 1)[0].find("/", 1) < 0:
+	if (input.startswith("/") and not input.startswith("/ ") and input != "/"
+	 and input.split(" ", 1)[0].split("\n", 1)[0].find("/", 1) < 0):
 		for cmd in weechat.config_get_plugin("whitelist_cmds").lower().split(","):
 			if not input.startswith("/%s " % cmd): continue
 			output = "/%s " % cmd