diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 2128d89c268..7d960000576 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -384,7 +384,9 @@ Currently-active file is at the head of the list.")
 			     "while\\s +.*:"
 			     "for\\s +.*:"
 			     "if\\s +.*:"
-			     "elif\\s +.*:")
+			     "elif\\s +.*:"
+			     "\\(return\\|break\\|raise\\|continue\\)[ \t\n]"
+			     )
 			   "\\|")
 	  "\\)")
   "Regexp matching lines to not outdent after.")