diff --git a/docs/imviz/export_data.rst b/docs/imviz/export_data.rst
index 0f8390b10d..328f5c1f91 100644
--- a/docs/imviz/export_data.rst
+++ b/docs/imviz/export_data.rst
@@ -117,4 +117,9 @@ Markers Table
 
 All mouseover information in the :ref:`markers plugin <markers-plugin>` can be exported to an
 :ref:`astropy table <astropy:astropy-table>`
-by calling :meth:`~jdaviz.core.template_mixin.TableMixin.export_table` (see :ref:`plugin-apis`).
+by calling :meth:`~jdaviz.core.template_mixin.TableMixin.export_table` (see :ref:`plugin-apis`):
+
+.. code-block:: python
+
+    markers_plugin = imviz.plugins["Markers"]
+    markers_table = markers_plugin.export_table()
diff --git a/docs/mosviz/plugins.rst b/docs/mosviz/plugins.rst
index 0d9d1442ad..7ca0c9376f 100644
--- a/docs/mosviz/plugins.rst
+++ b/docs/mosviz/plugins.rst
@@ -44,6 +44,8 @@ Subset Tools
     :ref:`Subset Tools <imviz-subset-plugin>`
         Imviz documentation describing the concept of subsets in Jdaviz.
 
+.. _imviz_export_markers:
+
 Markers
 =======
 
diff --git a/docs/specviz/export_data.rst b/docs/specviz/export_data.rst
index 27266aae74..f7c0fab6f3 100644
--- a/docs/specviz/export_data.rst
+++ b/docs/specviz/export_data.rst
@@ -96,6 +96,7 @@ To extract all of the model parameters:
     myparams
 
 where the ``model_label`` parameter identifies which model should be returned.
+.. _specviz-export-markers:
 
 Markers Table
 =============
diff --git a/jdaviz/core/template_mixin.py b/jdaviz/core/template_mixin.py
index a08150d0f2..24215ced85 100644
--- a/jdaviz/core/template_mixin.py
+++ b/jdaviz/core/template_mixin.py
@@ -506,9 +506,7 @@ def select_next(self):
 
         cycle = self.choices
         curr_ind = cycle.index(self.selected)
-        if curr_ind >= len(cycle) - 1:
-            curr_ind = -1
-        self.selected = cycle[curr_ind + 1]
+        self.selected = cycle[(curr_ind + 1) % len(cycle)]
         return self.selected
 
     @property