diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 99795a0..624af01 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -462,7 +462,7 @@
     (define-key py-mode-map [delete]    'py-electric-delete)
     (define-key py-mode-map [backspace] 'py-electric-backspace))
   ;; marking interesting locations
-  (define-key py-mode-map "\C-c\C-m"  'py-mark-def-or-class)
+  (define-key py-mode-map "\e\C-h"    'py-mark-def-or-class)
   (define-key py-mode-map "\C-c\C-k"  'py-mark-block)
   ;; Miscellaneous
   (define-key py-mode-map "\C-c:"     'py-guess-indent-offset)
@@ -2049,7 +2049,9 @@
 		     (re-search-backward "^[ \t]*[^ \t#]" nil 'move)
 		     (forward-line 1))
 		  ;; no comment, so go back
-		  (goto-char start))))))))
+		  (goto-char start)))))))
+  (exchange-point-and-mark)
+  (py-keep-region-active))
 
 ;; ripped from cc-mode
 (defun py-forward-into-nomenclature (&optional arg)