diff --git a/AUTHORS.txt b/AUTHORS.txt
index 517fcb5..6e77b5c 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -48,6 +48,6 @@ Pedro Ferrari (@petobens)
 Daniel Hahler (@blueyed)
 Dave Honneffer (@pearofducks)
 Bagrat Aznauryan (@n9code)
-
+Tomoyuki Kashiro (@kashiro)
 
 @something are github user names.
diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index fad7ca4..49e9d0a 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -491,8 +491,10 @@ function! jedi#complete_opened(is_popup_on_dot)
             return "\<Down>"
         endif
         if a:is_popup_on_dot
-            " Prevent completion of the first entry with dot completion.
-            return "\<C-p>"
+            if &completeopt !~ '\(noinsert\|noselect\)'
+                " Prevent completion of the first entry with dot completion.
+                return "\<C-p>"
+            endif
         endif
     endif
     return ""