diff --git a/plugin/supertab.vim b/plugin/supertab.vim
index 985a53c..67f8c5c 100644
--- a/plugin/supertab.vim
+++ b/plugin/supertab.vim
@@ -370,10 +370,11 @@ function! s:SuperTab(command)
     " already in completion mode and not resetting for longest enhancement, so
     " just scroll to next/previous
     elseif pumvisible() && !b:complReset
+      let type = b:complType == 'context' ? b:complTypeContext : b:complType
       if a:command == 'n'
-        return b:complType == "\<c-p>" ? "\<c-p>" : "\<c-n>"
+        return type == "\<c-p>" ? "\<c-p>" : "\<c-n>"
       endif
-      return b:complType == "\<c-p>" ? "\<c-n>" : "\<c-p>"
+      return type == "\<c-p>" ? "\<c-n>" : "\<c-p>"
     endif
 
     " handle 'context' completion.