diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index ff790bdc25c..7f4aa940d8d 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1062,7 +1062,12 @@ Returns nil if point is not in a def or class."
     (while (and (forward-line 1)
                 (not (eobp))
                 (or (not (current-word))
-                    (> (current-indentation) beg-defun-indent))))
+                    ;; This checks if the indentation is less than the base
+                    ;; one and if the line is not a comment
+                    (or (> (current-indentation) beg-defun-indent)
+                        (equal
+                         (char-after
+                          (+ (point) (current-indentation))) ?#)))))
     (python-util-forward-comment)
     (goto-char (line-beginning-position))))