diff --git a/felt/gui/recent_maps_list_view.py b/felt/gui/recent_maps_list_view.py
index 4a49eca..f85e88c 100644
--- a/felt/gui/recent_maps_list_view.py
+++ b/felt/gui/recent_maps_list_view.py
@@ -287,6 +287,11 @@ def set_workspace_id(self, workspace_id: Optional[str]):
         Sets the selected workspace ID to filter the view
         """
         self._model.set_workspace_id(workspace_id)
+        # when you change the workspace the new map
+        # option should get selected again
+        self.selectionModel().select(
+            self._model.index(0, 0),
+            QItemSelectionModel.ClearAndSelect)
 
     def set_new_map_title(self, title: str):
         """
@@ -301,7 +306,7 @@ def _on_first_results_found(self):
 
         # while you search, the first search result should be
         # selected so you can quickly hit enter
-        if self._model.filter_string() or self._model.workspace_id():
+        if self._model.filter_string():
             self.selectionModel().select(
                 self._model.index(1, 0),
                 QItemSelectionModel.ClearAndSelect)