diff --git a/NEWS b/NEWS
index 8d7ded55..10f1a104 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ ncmpcpp-0.7 (????-??-??)
 ncmpcpp-0.6.3 (????-??-??)
 
 * Fix floating point exception when adding a specific number of random items.
+* Passwords are no longer added to the input history.
 
 ncmpcpp-0.6.2 (2014-12-13)
 
diff --git a/src/window.cpp b/src/window.cpp
index 47c6748f..1bdce3fc 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -733,7 +733,7 @@ std::string Window::prompt(const std::string &base, size_t width, bool encrypted
 	curs_set(0);
 	if (input != nullptr)
 	{
-		if (input[0] != 0)
+		if (!encrypted && input[0] != 0)
 			add_history(input);
 		result = input;
 		free(input);