diff --git a/src/input/text_input.cc b/src/input/text_input.cc
index 032633ee..2d5283c6 100644
--- a/src/input/text_input.cc
+++ b/src/input/text_input.cc
@@ -36,7 +36,6 @@
 
 #include "config.h"
 
-#include <sstream>
 #include <ncurses.h>
 
 #include "text_input.h"
@@ -45,8 +44,6 @@ namespace input {
 
 bool
 TextInput::pressed(int key) {
-  //std::stringstream str;
-
   if (m_alt) {
     m_alt = false;
 
@@ -102,18 +99,6 @@ TextInput::pressed(int key) {
 
     default:
       return false;
-
-      // Testcode.
-//       if (key == KEY_ENTER || key == '\n')
-// 	return false;
-
-//       str << "\\x" << std::hex << key;
-
-//       Base::insert(m_pos, str.str());
-
-//       m_pos += str.str().length();
-
-//       return true;
     }
   }
 
diff --git a/src/ui/download_list.cc b/src/ui/download_list.cc
index 5fbc1569..e1e4576a 100644
--- a/src/ui/download_list.cc
+++ b/src/ui/download_list.cc
@@ -241,6 +241,9 @@ DownloadList::receive_check_hash() {
 
 void
 DownloadList::receive_view_input(bool useDefault) {
+  if (m_windowTextInput->get_active())
+    return;
+
   m_control->get_ui().window_statusbar()->set_active(false);
   m_windowTextInput->set_active(true);
   m_control->get_display().adjust_layout();
@@ -255,6 +258,9 @@ DownloadList::receive_view_input(bool useDefault) {
 
 void
 DownloadList::receive_exit_input(bool useDefault) {
+  if (!m_windowTextInput->get_active())
+    return;
+
   m_control->get_ui().window_statusbar()->set_active(true);
   m_windowTextInput->set_active(false);