diff --git a/Settings.ui b/Settings.ui
index 551085b..8a0b131 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -133,6 +133,7 @@
                           <item id="CYCLE" translatable="yes">Cycle through windows</item>
                           <item id="CYCLE-MIN" translatable="yes">Cycle windows + minimize</item>
                           <item id="TOGGLE-SHOWPREVIEW" translatable="yes">Toggle single / Preview multiple</item>
+                          <item id="TOGGLE-CYCLE" translatable="yes">Toggle single / Cycle multiple</item>
                           <item id="QUIT" translatable="yes">Quit</item>
                         </items>
                       </object>
@@ -6525,6 +6526,7 @@
                                   <item id="CYCLE-MIN" translatable="yes">Cycle windows + minimize</item>
                                   <item id="CYCLE" translatable="yes">Cycle through windows</item>
                                   <item id="TOGGLE-SHOWPREVIEW" translatable="yes">Toggle single / Preview multiple</item>
+                                  <item id="TOGGLE-CYCLE" translatable="yes">Toggle single / Cycle multiple</item>
                                   <item id="MINIMIZE" translatable="yes">Toggle windows</item>
                                   <item id="RAISE" translatable="yes">Raise windows</item>
                                   <item id="LAUNCH" translatable="yes">Launch new instance</item>
diff --git a/appIcons.js b/appIcons.js
index 2279057..d4fcf75 100644
--- a/appIcons.js
+++ b/appIcons.js
@@ -811,9 +811,9 @@ var taskbarAppIcon = Utils.defineClass({
             if (this.window && !handleAsGrouped) {
                 //ungrouped applications behaviors
                 switch (buttonAction) {
-                    case 'RAISE': case 'CYCLE': case 'CYCLE-MIN': case 'MINIMIZE': case 'TOGGLE-SHOWPREVIEW':
+                    case 'RAISE': case 'CYCLE': case 'CYCLE-MIN': case 'MINIMIZE': case 'TOGGLE-SHOWPREVIEW': case 'TOGGLE-CYCLE':
                         if (!Main.overview._shown && 
-                            (buttonAction == 'MINIMIZE' || buttonAction == 'TOGGLE-SHOWPREVIEW' || buttonAction == 'CYCLE-MIN') && 
+                            (buttonAction == 'MINIMIZE' || buttonAction == 'TOGGLE-SHOWPREVIEW' || buttonAction == 'TOGGLE-CYCLE' || buttonAction == 'CYCLE-MIN') && 
                             (this._isFocusedWindow() || (buttonAction == 'MINIMIZE' && (button == 2 || modifiers & Clutter.ModifierType.SHIFT_MASK)))) {
                                 this.window.minimize();
                         } else {
@@ -906,7 +906,20 @@ var taskbarAppIcon = Utils.defineClass({
                         else
                             this.app.activate();
                         break;
-        
+                    case "TOGGLE-CYCLE":
+                        if (!Main.overview._shown) {
+                            if (appCount == 1) {
+                                if (appHasFocus)
+                                    minimizeWindow(this.app, false, monitor);
+                                else
+                                    activateFirstWindow(this.app, monitor);
+                            } else {
+                                cycleThroughWindows(this.app, false, false, monitor);
+                            } 
+                        }
+                        else
+                            this.app.activate();
+                        break;
                     case "QUIT":
                         closeAllWindows(this.app, monitor);
                         break;
diff --git a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
index 5cf666d..e044f74 100644
--- a/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
+++ b/schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
@@ -17,6 +17,7 @@
     <value value='4' nick='CYCLE-MIN'/>
     <value value='5' nick='QUIT'/>
     <value value='6' nick='TOGGLE-SHOWPREVIEW'/>
+    <value value='7' nick='TOGGLE-CYCLE'/>
   </enum>
   <enum id='org.gnome.shell.extensions.dash-to-panel.scrollAction'>
     <value value='0' nick='NOTHING'/>