diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 613a03fdd..3ef0d21c2 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -1471,7 +1471,7 @@ class Coder:
         words = set(word for word in content.split())
 
         # drop sentence punctuation from the end
-        words = set(word.rstrip(",.!;:") for word in words)
+        words = set(word.rstrip(",.!;:?") for word in words)
 
         # strip away all kinds of quotes
         quotes = "".join(['"', "'", "`"])