diff --git a/tests/acceptance/features/bootstrap/FileListContext.php b/tests/acceptance/features/bootstrap/FileListContext.php
index 6a39d7a999..5206e6417d 100644
--- a/tests/acceptance/features/bootstrap/FileListContext.php
+++ b/tests/acceptance/features/bootstrap/FileListContext.php
@@ -295,6 +295,15 @@ class FileListContext implements Context, ActorAwareInterface {
 
 		$this->actor->find(self::renameMenuItem(), 2)->click();
 
+		// For reference, due to a bug in the Firefox driver of Selenium and/or
+		// maybe in Firefox itself, as a range is selected in the rename input
+		// (the name of the file, without its extension) when the value is set
+		// the window must be in the foreground. Otherwise, if the window is in
+		// the background, instead of setting the value in the whole field it
+		// would be set only in the selected range.
+		// This should not be a problem, though, as the default behaviour is to
+		// bring the browser window to the foreground when switching to a
+		// different actor.
 		$this->actor->find(self::renameInputForFile($this->fileListAncestor, $fileName1), 10)->setValue($fileName2 . "\r");
 	}
 
diff --git a/tests/acceptance/features/core/ActorContext.php b/tests/acceptance/features/core/ActorContext.php
index 2cdc4b01ff..81587e4068 100644
--- a/tests/acceptance/features/core/ActorContext.php
+++ b/tests/acceptance/features/core/ActorContext.php
@@ -164,6 +164,14 @@ class ActorContext extends RawMinkContext {
 		}
 
 		$this->currentActor = $this->actors[$actorName];
+
+		// Ensure that the browser window of the actor is the one in the
+		// foreground; this works around a bug in the Firefox driver of Selenium
+		// and/or maybe in Firefox itself when interacting with a window in the
+		// background, but also reflects better how the user would interact with
+		// the browser in real life.
+		$session = $this->actors[$actorName]->getSession();
+		$session->switchToWindow($session->getWindowName());
 	}
 
 	/**