1 files changed, 4 insertions, 6 deletions
diff --git a/gui.py b/gui.py
index 45d3ffa91..af09593bc 100755
--- a/gui.py
+++ b/gui.py
@@ -940,15 +940,13 @@ class InstallControlWindow:
 	except StayOnScreen:
 	    return
 
+	ics = InstallControlState(self)
+	ics.setGrabNext(True)
+	self.update(ics)
+
 	self.dispatch.gotoNext()
 	self.dir = 1
 
-        # make sure Next button has focus on keyboard screen
-        # if you press Enter, it would load release notes
-        (step, args) = self.dispatch.currentStep()
-        if step == "keyboard":
-            self.mainxml.get_widget("nextButton").grab_focus()
-
         self.setScreen ()
 
     def loadReleaseNotes(self):