diff --git a/input_common.c b/input_common.c
index 0955e03bf..b271b6a51 100644
--- a/input_common.c
+++ b/input_common.c
@@ -115,8 +115,7 @@ static wint_t readb()
 				{
 					debug( 3, L"Wake up on universal variable event" );					
 					env_universal_read_all();
-					debug( 3, L"Return R_NULL" );					
-					return R_NULL;
+					do_loop = 1;
 				}				
 			}
 			if( FD_ISSET( 0, &fd ) )
diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index 2ef8bceec..42666ff7e 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -2,6 +2,11 @@
 # string has a newline before and after, so that fish will know how
 # long it is.
 
+# This event handler makes sure the prompt is repainted when fish_color_cwd changes value
+function __fish_repaint --on-variable fish_color_cwd -d (N_ "Event handler, repaints the prompt when fish_color_cwd changes")
+	commandline -f null
+end
+
 function fish_prompt -d (N_ "Write out the prompt")
 
 	# Just calculate these once, to save a few cycles when displaying the prompt