1 files changed, 3 insertions, 6 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3c1e85834de..71c5453ee2d 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1080,12 +1080,9 @@ Returns nil if point is not in a def or class."
     (while (and (forward-line 1)
                 (not (eobp))
                 (or (not (current-word))
-                    ;; 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))) ?#)))))
+                    (equal (char-after (+ (point) (current-indentation))) ?#)
+                    (> (current-indentation) beg-defun-indent)
+                    (not (looking-at python-nav-beginning-of-defun-regexp)))))
     (python-util-forward-comment)
     (goto-char (line-beginning-position))))