diff --git a/plugins/pager/pager-dialog.glade b/plugins/pager/pager-dialog.glade
index e498e79865b79735d4b04744643c541e65e5030a..306a434d886ba73a0835238e7e37515e83fe01d9 100644
--- a/plugins/pager/pager-dialog.glade
+++ b/plugins/pager/pager-dialog.glade
@@ -175,6 +175,20 @@
                 <property name="top_attach">3</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkSwitch" id="wrap-workspaces">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="halign">end</property>
+                <property name="valign">center</property>
+                <property name="sensitive" bind-source="workspace-scrolling"
+                          bind-property="active" bind-flags="G_BINDING_SYNC_CREATE"/>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkLabel" id="numbering-label">
                 <property name="visible">True</property>
@@ -201,6 +215,21 @@
                 <property name="top_attach">3</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel" id="wrap-workspaces-label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">12</property>
+                <property name="label" translatable="yes">Wrap around workspaces</property>
+                <property name="xalign">0</property>
+                <property name="sensitive" bind-source="workspace-scrolling"
+                          bind-property="active" bind-flags="G_BINDING_SYNC_CREATE"/>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 5b9aad1d2a0be104785d34e237d22727e61e3b8c..def6e14e88b2d61476a09ef7005afdaf8cf3b124 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -726,6 +726,12 @@ pager_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
                           G_OBJECT (object), "active",
                           G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
 
+  object = gtk_builder_get_object (builder, "wrap-workspaces");
+  panel_return_if_fail (GTK_IS_SWITCH (object));
+  g_object_bind_property (G_OBJECT (plugin), "wrap-workspaces",
+                          G_OBJECT (object), "active",
+                          G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
+
   object = gtk_builder_get_object (builder, "numbering-label");
   g_object_bind_property (G_OBJECT (plugin), "miniature-view",
                           G_OBJECT (object), "visible",