diff --git a/repos/os/src/server/nit_fb/main.cc b/repos/os/src/server/nit_fb/main.cc
index 242509f046..3764c2237c 100644
--- a/repos/os/src/server/nit_fb/main.cc
+++ b/repos/os/src/server/nit_fb/main.cc
@@ -301,8 +301,18 @@ struct Nit_fb::Main : View_updater
 		Input::Event const * const events = input_ds.local_addr<Input::Event>();
 
 		unsigned const num = nitpicker.input()->flush();
-		for (unsigned i = 0; i < num; i++)
+		bool update = false;
+
+		for (unsigned i = 0; i < num; i++) {
+			if (events[i].type() == Input::Event::FOCUS)
+				update = events[i].code();
+
 			input_session.submit(translate_event(events[i], position, fb_session.size()));
+		}
+
+		/* get to front if we got input focus */
+		if (update)
+			update_view();
 	}
 
 	Signal_handler<Main> input_handler =