diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index ae570e5..48d1b61 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -968,6 +968,8 @@
   (save-excursion
     (and (progn (back-to-indentation)
 		(looking-at py-outdent-re))
+	 ;; short circuit infloop on illegal construct
+	 (not (bobp))
 	 (progn (forward-line -1)
 		(py-goto-initial-line)
 		(back-to-indentation)