diff --git a/src/rc/ctags.kak b/src/rc/ctags.kak
index badf4e98..11b52360 100644
--- a/src/rc/ctags.kak
+++ b/src/rc/ctags.kak
@@ -30,7 +30,7 @@ def funcinfo %{
         exec [(<space>B;
         %sh{
             if [[ "$kak_selection" =~ [a-zA-Z_]+\( ]]; then
-                sigs=$(readtags -e ${kak_selection%(} | grep kind:function | sed -e s/^.*signature://)
+                sigs=$(readtags -e ${kak_selection%(} | grep kind:f | sed -re 's/^(\S+).*(class|struct|namespace):(\S+).*signature:(.*)$/\4 [\3::\1]/')
                 if [[ -n "$sigs" ]]; then
                     echo "info -anchor right '$sigs'"
                     exit
@@ -43,5 +43,6 @@ def funcinfo %{
 
 hook global WinSetOption filetype=cpp %{
      hook window NormalIdle .* funcinfo
+     hook window NormalEnd  .* info
      hook window InsertIdle .* funcinfo
 }