diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index d8d460a..444085e 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -21,6 +21,7 @@
 source test_menu.vim
 source test_messages.vim
 source test_partial.vim
+source test_popup.vim
 source test_reltime.vim
 source test_searchpos.vim
 source test_set.vim
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
new file mode 100644
index 0000000..a5673c9
--- /dev/null
+++ b/src/testdir/test_popup.vim
@@ -0,0 +1,35 @@
+" Test for completion menu
+
+inoremap <F5> <C-R>=ListMonths()<CR>
+let g:months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
+let g:setting = ''
+
+func ListMonths()
+    if g:setting != ''
+	exe ":set" g:setting
+    endif
+    call complete(col('.'), g:months) 
+    return ''
+endfunc
+
+func! Test_popup_completion_insertmode()
+    new
+    call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
+    call assert_equal('February', getline(1))
+    %d
+    let g:setting = 'noinsertmode'
+    call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
+    call assert_equal('February', getline(1))
+    call assert_false(pumvisible())
+    %d
+    let g:setting = ''
+    call feedkeys("a\<f5>". repeat("\<c-n>",12)."\<enter>\<esc>", 'tx')
+    call assert_equal('', getline(1))
+    %d
+    call feedkeys("a\<f5>\<c-p>\<enter>\<esc>", 'tx')
+    call assert_equal('', getline(1))
+    %d
+    call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx')
+    call assert_equal('December', getline(1))
+    bwipe!
+endfunc