diff --git a/autoload/youcompleteme.vim b/autoload/youcompleteme.vim
index b43df82a39..a0e33510a3 100644
--- a/autoload/youcompleteme.vim
+++ b/autoload/youcompleteme.vim
@@ -717,6 +717,7 @@ function! s:EnableAutoHover()
     augroup YcmBufHover
       autocmd! * <buffer>
       autocmd CursorHold <buffer> call s:Hover()
+      autocmd WinScrolled <buffer> call popup_close( s:cursorhold_popup )
     augroup END
   endif
 endfunction
@@ -1621,9 +1622,11 @@ if exists( '*popup_atcursor' )
       return
     endif
 
-    call youcompleteme#GetCommandResponseAsync(
-          \ function( 's:ShowHoverResult' ),
-          \ b:ycm_hover.command )
+    if empty( popup_getpos( s:cursorhold_popup ) )
+      call youcompleteme#GetCommandResponseAsync(
+            \ function( 's:ShowHoverResult' ),
+            \ b:ycm_hover.command )
+    endif
   endfunction
 
 
diff --git a/test/hover.test.vim b/test/hover.test.vim
index f19df03db3..79a911dac6 100644
--- a/test/hover.test.vim
+++ b/test/hover.test.vim
@@ -482,3 +482,30 @@ function! Test_Long_Wrapped()
 
   call popup_clear()
 endfunction
+
+function! Test_Long_Scrolling()
+  let f = tempname() . '.cc'
+  execut 'edit' f
+  let current_win_id = bufwinid( '%' )
+  let lines = repeat( [ ' * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' ], 50 )
+  call insert( lines, '/**', 0 )
+  call extend( lines, [ ' */', 'void f();' ] )
+  call setline( 1, lines )
+  call cursor( [ 54, 6 ] )
+  doautocmd CursorHold
+  call WaitForAssert( { -> assert_equal( 1, len( popup_list() ) ) } )
+  let popup_id = popup_list()[ 0 ]
+  call test_setmouse( 15, 15 )
+  call feedkeys( "\<ScrollWheelDown>", "xt" )
+  let win_info = getwininfo( popup_id )[ 0 ]
+  call assert_notequal( 1, win_info[ 'topline' ] )
+  doautocmd CursorHold
+  sleep 1
+  let win_info = getwininfo( popup_id )[ 0 ]
+  call assert_notequal( 1, win_info[ 'topline' ] )
+  let new_mouse_line = getwininfo( current_win_id )[ 0 ][ 'height' ]
+  call test_setmouse( new_mouse_line, 15 )
+  call feedkeys( "\<ScrollWheelDown>", "xt" )
+  doautocmd WinScrolled
+  call assert_equal( 0, len( popup_list() ) )
+endfunction