diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim
index 669259e..6eca52d 100644
--- a/plugin/delimitMate.vim
+++ b/plugin/delimitMate.vim
@@ -143,7 +143,9 @@ function! s:Map() "{{{
 		let save_keymap = &keymap
 		let save_iminsert = &iminsert
 		let save_imsearch = &imsearch
+		let save_cpo = &cpo
 		set keymap=
+		set cpo&vim
 		if b:_l_delimitMate_autoclose
 			call s:AutoClose()
 		else
@@ -151,6 +153,7 @@ function! s:Map() "{{{
 		endif
 		call s:ExtraMappings()
 	finally
+		let &cpo = save_cpo
 		let &keymap = save_keymap
 		let &iminsert = save_iminsert
 		let &imsearch = save_imsearch
diff --git a/test/autoclose_quotes.txt b/test/autoclose_quotes.txt
index c0d3c19..b6fd398 100644
--- a/test/autoclose_quotes.txt
+++ b/test/autoclose_quotes.txt
@@ -30,3 +30,5 @@ let g:delimitMate_autoclose = 1
 # Handle backspace gracefully.
 set backspace=
 "'\<Esc>a\<BS>x" "'x'"
+set cpo=ces$
+"'x" "'x'"