diff --git a/rc/clang.kak b/rc/clang.kak
index b2c9c2202..792507717 100644
--- a/rc/clang.kak
+++ b/rc/clang.kak
@@ -36,6 +36,8 @@ def clang-complete %{
                         /^COMPLETION:/ && ! /\(Hidden\)/ {
                              gsub(/[[{<]#|#[}>]/, "", $3)
                              gsub(/#]/, " ", $3)
+                             gsub(/:: /, "::", $3)
+                             gsub(/ +$/, "", $3)
                              gsub(/:/, "\\:", $2)
                              gsub(/:/, "\\:", $3)
                              id=substr($2, 1, length($2)-1)