diff --git a/NEWS b/NEWS
index a76ac089..f693faf0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Snapshot 3e491c2dc7
+
 * #4715: Filter new items that appear in the mesh view. (tomeu)
 * #4716: Filter correctly activity icons in the mesh view. (tomeu)
 * Use HOME/.i18n in control panel and reset jabber_registered to False (erikos)
diff --git a/shell/model/homemodel.py b/shell/model/homemodel.py
index fb8cc568..3ad8cdf5 100644
--- a/shell/model/homemodel.py
+++ b/shell/model/homemodel.py
@@ -71,11 +71,12 @@ class HomeModel(gobject.GObject):
                        self._active_window_changed_cb)
 
     def get_previous_activity(self):
-        i = self._activities.index(self._pending_activity)
+        activities = self._get_started_activities()
+        i = activities.index(self._pending_activity)
         if i > 0:
-            return self._activities[i - 1]
+            return activities[i - 1]
         else:
-            return None
+            return activities[0]
 
     def get_next_activity(self):
         i = self._activities.index(self._pending_activity)