diff --git a/org-src.el b/org-src.el
index 7876dea..96ab8ad 100644
--- a/org-src.el
+++ b/org-src.el
@@ -479,6 +479,7 @@ Leave point in edit buffer."
 		 (y-or-n-p "Return to existing edit buffer ([n] will revert changes)? ")))
 	;; Move to existing buffer.
 	(org-src-switch-to-buffer old-edit-buffer 'return)
+      (setq-local org-src--return-point (point))
       ;; Discard old edit buffer.
       (when old-edit-buffer
 	(with-current-buffer old-edit-buffer (org-src--remove-overlay))
@@ -1106,7 +1107,9 @@ the area in the Org mode buffer."
 (defun org-edit-src-abort ()
   "Abort editing of the src code and return to the Org buffer."
   (interactive)
-  (let (org-src--allow-write-back) (org-edit-src-exit)))
+  (let (org-src--allow-write-back)
+    (org-edit-src-exit)
+    (goto-char org-src--return-point)))

 (defun org-edit-src-continue (e)
   "Unconditionally return to buffer editing area under point.