diff --git a/popup__iframe.html b/popup__iframe.html
index 57d8536f..82d31d78 100644
--- a/popup__iframe.html
+++ b/popup__iframe.html
@@ -130,7 +130,15 @@
             <b class="setting-label" style="position:relative;">Long press action:</b>
             <select class="secondary-role" style="width:135px">
               {{#each secondaryRole}}
-                <option value="{{name}}">{{name}}</option>
+                {{#if groupName}}
+                  <optgroup label="{{groupName}}">
+                {{/if}}
+                {{#each groupValues}}
+                  <option value="{{value}}">{{label}}</option>
+                {{/each}}
+                {{#if groupName}}
+                  </optgroup>
+                {{/if}}
               {{/each}}
             </select>
             <i class="fa fa-question-circle" style="margin-left:5px" data-toggle="tooltip" data-placement="right" title="This action happens when the key is being held along with another key."></i>
diff --git a/script.js b/script.js
index 32e47655..f9802695 100644
--- a/script.js
+++ b/script.js
@@ -141,41 +141,68 @@ $(function() {
       ],
       secondaryRole: [
         {
-          name: 'None'
+          groupName: '',
+          groupValues: [
+            {
+              value: 'None',
+              label: 'None',
+            }
+          ]
         },
         {
-          name: 'LShift'
+          groupName: 'Modifiers',
+          groupValues: [
+            {
+              value: 'LShift',
+              label: 'LShift'
+            },
+            {
+              value: 'LCtrl',
+              label: 'LCtrl'
+            },
+            {
+              value: 'LSuper',
+              label: 'LSuper'
+            },
+            {
+              value: 'LAlt',
+              label: 'LAlt'
+            },
+            {
+              value: 'RAlt',
+              label: 'RAlt'
+            },
+            {
+              value: 'RSuper',
+              label: 'RSuper'
+            },
+            {
+              value: 'RCtrl',
+              label: 'RCtrl'
+            },
+            {
+              value: 'RShift',
+              label: 'RShift'
+            }
+          ]
         },
         {
-          name: 'LCtrl'
-        },
-        {
-          name: 'LSuper'
-        },
-        {
-          name: 'LAlt'
-        },
-        {
-          name: 'RAlt'
-        },
-        {
-          name: 'RSuper'
-        },
-        {
-          name: 'RCtrl'
-        },
-        {
-          name: 'RShift'
-        },
-        {
-          name: 'Mod'
-        },
-        {
-          name: 'Mouse'
-        },
-        {
-          name: 'Fn'
-        },
+          groupName: 'Layer Switcher',
+          groupValues: [
+            {
+              value: 'Mod',
+              label: 'Mod'
+            },
+            {
+              value: 'Mouse',
+              label: 'Mouse'
+            },
+            {
+              value: 'Fn',
+              label: 'Fn'
+            }
+          ]
+        }
       ]
     },
     macro: {