diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c
index 3b96ebda00..62510eb122 100644
--- a/src/nvim/popupmenu.c
+++ b/src/nvim/popupmenu.c
@@ -959,10 +959,7 @@ static void pum_preview_set_text(buf_T *buf, char *info, linenr_T *lnum, int *ma
 static void pum_adjust_info_position(win_T *wp, int width)
 {
   int border_width = pum_border_width();
-  int col = pum_col + pum_width + 1 + border_width;
-  if (border_width < 0) {
-    col += pum_scrollbar;
-  }
+  int col = pum_col + pum_width + 1 + MAX(border_width, pum_scrollbar);
   // TODO(glepnir): support config align border by using completepopup
   // align menu
   int right_extra = Columns - col;
diff --git a/test/functional/ui/popupmenu_spec.lua b/test/functional/ui/popupmenu_spec.lua
index 6d835db5ad..9b35f71ea7 100644
--- a/test/functional/ui/popupmenu_spec.lua
+++ b/test/functional/ui/popupmenu_spec.lua
@@ -9342,6 +9342,16 @@ describe('builtin popupmenu', function()
             :!^                            |
           ]])
         end
+        feed('<ESC>:set pumheight=2<CR>Gi<C-X><C-O>')
+        if not multigrid then
+          screen:expect([[
+            one^                           |
+            {12:one            }{c: }{n:1info}{1:         }|
+            {n:two            }{12: }{1:              }|
+            {1:~                             }|*7
+            {5:-- }{6:match 1 of 3}               |
+          ]])
+        end
       end)
       it("no crash when 'pumborder' set #36337", function()
         command('set autocomplete pumborder=rounded complete=o cot=popup,menuone,noinsert')