diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 7ca3a6499..d0b0c01bc 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -5542,8 +5542,12 @@ static void Keys3d(void)
                         else
                         {
                             clamped = addtobyte(&AIMED_CF_SEL(shade), tsign);
+                            // TODO: factor formatting stuff out and use elsewhere?
                             (clamped ? message : silentmessage)
-                                ("%s %d shade %d%s", Typestr[searchstat], i,
+                                ("%s %s%d shade %d%s", Typestr[searchstat],
+                                 AIMING_AT_CEILING_OR_FLOOR ? "of sector " : "",
+                                 AIMING_AT_WALL_OR_MASK ? SELECT_WALL() :
+                                     (AIMING_AT_CEILING_OR_FLOOR ? searchsector : searchwall),
                                  AIMED_CF_SEL(shade), clamped ? " (clamped)":"");
                         }
                     }