diff --git a/src/input_handler.cc b/src/input_handler.cc
index 9f8667f7..ec461845 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -377,6 +377,11 @@ public:
 
             m_line_editor.insert_from(line.char_count_to(m_completions.start),
                                       completion);
+
+            // when we have only one completion candidate, make next tab complete
+            // from the new content.
+            if (candidates.size() == 1)
+                m_current_completion = -1;
         }
         else
         {