diff --git a/src/ui/download_list.cc b/src/ui/download_list.cc
index 1ab1eab7..c9aca0ff 100644
--- a/src/ui/download_list.cc
+++ b/src/ui/download_list.cc
@@ -89,7 +89,7 @@ DownloadList::unfocus_download(core::Download* d) {
   if (m_state == DISPLAY_DOWNLOAD && d == static_cast<Download*>(m_uiArray[DISPLAY_DOWNLOAD])->download())
     activate_display(DISPLAY_DOWNLOAD_LIST);
 
-  if (*current_view()->focus() == d && current_view()->focus() < current_view()->end_visible())
+  if (current_view()->focus() < current_view()->end_visible() && *current_view()->focus() == d)
       current_view()->next_focus();
 }