diff --git a/src/options/controls-settings/add-edit-action-popup.vue b/src/options/controls-settings/add-edit-action-popup.vue
index 59b10c1..45e1fbd 100644
--- a/src/options/controls-settings/add-edit-action-popup.vue
+++ b/src/options/controls-settings/add-edit-action-popup.vue
@@ -58,49 +58,27 @@
       </div>
 
       <div class="flex flex-row">
-        <b>Scopes:</b>
+        <b>Show this action in the following tabs:</b>
       </div>
 
-      <div class="flex flex-row">
-        Global:
-      </div>
+      <ScopeSettings :scopeOptions="globalScopeOptions"
+                     @show="updateScopes('global', 'show', $event)"
+                     @set-label="updateScopes('global', 'label', $event)"
+                     @set-shortcut="updateScopes('global', 'shortcut', $event)"
+      />
+      <ScopeSettings :scopeOptions="siteScopeOptions"
+                     @show="updateScopes('site', 'show', $event)"
+                     @set-label="updateScopes('site', 'label', $event)"
+                     @set-shortcut="updateScopes('site', 'shortcut', $event)"
+      />
+      <ScopeSettings :scopeOptions="pageScopeOptions"
+                     @show="updateScopes('page', 'show', $event)"
+                     @set-label="updateScopes('page', 'label', $event)"
+                     @set-shortcut="updateScopes('page', 'shortcut', $event)"
+      />
 
-      <div class="flex flex-row">
-        <div class="flex label-secondary form-label">
-          <span class="w100">
-            Show in popup
-          </span>
-        </div>
-        <div class="flex flex-input">
-          <input type="checkbox"
-                 :value="actionIndex < 0  ? true : settings.active.actions[actionIndex].scopes.global && settings.active.actions[actionIndex].scopes.global.show"
-                 @input="updateScopes('global', 'show', $event.target.value)"
-          >
-        </div>
-      </div>
-      <div class="flex flex-row">
-        <div class="flex label-secondary form-label">
-          <span class="w100">
-            Label <span class="hint"><small>(leave empty for default)</small></span>:
-          </span>
-        </div>
-        <div class="flex flex-input flex-grow">
-          <input type="text"
-                 class="w100"
-                 @input="updateScopes('global', 'label', $event.target.value)"
-                 >
-        </div>
-      </div>
-      <div class="flex flex-row">
-        <div class="flex label-secondary form-label">
-          <span class="w100">
-            Shortcut:
-          </span>
-        </div>
-        <div class="flex flex-input flex-grow">
-          TODO: insert shortcut changing component
-        </div>
-      </div>
+      
+      
     </div>
   </div>
 </template>
@@ -110,11 +88,17 @@ import Stretch from '../../common/enums/stretch.enum';
 import KeyboardShortcutParser from '../../common/js/KeyboardShortcutParser';
 import CommandChain from './command-builder/command-chain';
 import CommandAddEdit from './command-builder/command-add-edit';
+import ScopeSettings from './scope-settings-component/scope-settings';
 
 export default {
+  props: {
+    settings: Object,
+    actionIndex: Number,
+  },
   components: {
     CommandChain: CommandChain,
     CommandAddEdit: CommandAddEdit,
+    ScopeSettings,
   },
   data () {
     return {
@@ -123,6 +107,9 @@ export default {
         name: 'New action',
         label: 'New action',
         cmd: [],
+        scopes: {
+
+        }
       },
       addEditCommand: false,
       currentCmdIndex: -1,
@@ -130,9 +117,28 @@ export default {
   },
   created () {
   },
-  props: {
-    settings: Object,
-    actionIndex: Number,
+  computed: {
+    globalScopeOptions: function() {
+      return {
+        show: this.action.scopes.global && this.action.scopes.global.show || false,
+        label: (this.action.scopes.global && this.action.scopes.global.label) ? this.action.scopes.global.label : '',
+        shortcut: this.action.scopes.global && this.action.scopes.global.shortcut
+      }
+    },
+    siteScopeOptions: function() {
+      return {
+        show: this.action.scopes.site && this.action.scopes.site.show || false,
+        label: (this.action.scopes.site && this.action.scopes.site.label) ? this.action.scopes.site.label : '',
+        shortcut: this.action.scopes.site && this.action.scopes.site.shortcut
+      }
+    },
+    pageScopeOptions: function() {
+      return {
+        show: this.action.scopes.page && this.action.scopes.page.show || false,
+        label: (this.action.scopes.page && this.action.scopes.page.label) ? this.action.scopes.page.label : '',
+        shortcut: this.action.scopes.page && this.action.scopes.page.shortcut
+      }
+    }
   },
   methods: {
     parseActionShortcut(action) {
diff --git a/src/options/controls-settings/scope-settings-component/scope-settings.vue b/src/options/controls-settings/scope-settings-component/scope-settings.vue
new file mode 100644
index 0000000..36e15b3
--- /dev/null
+++ b/src/options/controls-settings/scope-settings-component/scope-settings.vue
@@ -0,0 +1,65 @@
+<template>
+  <div>
+    <div class="flex flex-row">
+      <div class="flex label-secondary form-label">
+        Show in popup:
+      </div>
+      <div class="flex flex-input flex-grow">
+        <input type="checkbox"
+               :checked="scopeOptions.show"
+               @input="$emit('show', $event.target.value)"
+        />
+      </div>
+    </div>
+    <div class="flex flex-row">
+      <div class="flex label-secondary form-label">
+        Custom label <small>(optional)</small>:
+      </div>
+      <div class="flex flex-input flex-grow">
+        <input type="text"
+               v-model="scopeOptions.label"
+               @input="setLabel"
+        />
+      </div>
+    </div>
+    <div class="flex flex-row">
+      <div class="flex label-secondary form-label">
+        <span class="w100">
+          Shortcut:
+        </span>
+      </div>
+      <div class="flex flex-input flex-grow">
+        <SetShortcutButton
+                            :shortcut="scopeOptions.shortcut"
+                            @set-shortcut="$emit('set-shortcut', $event)"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import SetShortcutButton from './set-shortcut-button';
+
+export default {
+  props: {
+    scopeOptions: Object,
+  },
+  components: {
+    SetShortcutButton,
+  },
+  methods: {
+    setLabel(label) {
+      console.log("label")
+      if (label.trim() === '') {
+        label = undefined;
+      }
+      this.$emit(label.trim())
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/options/controls-settings/scope-settings-component/set-shortcut-button.vue b/src/options/controls-settings/scope-settings-component/set-shortcut-button.vue
new file mode 100644
index 0000000..d14db81
--- /dev/null
+++ b/src/options/controls-settings/scope-settings-component/set-shortcut-button.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class="w100">
+    <input type="text"
+           :value="shortcutText"
+           @focus="initiateKeypress"
+           @keyup="processKeyup"
+    />
+
+  </div>
+</template>
+
+<script>
+import KeyboardShortcutParser from '../../../common/js/KeyboardShortcutParser'
+
+export default {
+  props: {
+    shortcut: Object,
+    waitingForPress: false,
+  },
+  data() {
+    return {
+      shortcutText: '[click to add shortcut]'
+    }
+  },
+  created(){
+    if (shortcut) {
+      this.shortcutText = KeyboardShortcutParser.parseShortcut(shortcut);
+    }
+  },
+  methods: {
+    initiateKeypress() {
+      this.shortcutText = '[Press a key or key combination]';
+      this.waitingForPress = true;
+    },
+    processKeyup(event) {
+      if (this.waitingForPress) {
+        console.log("PROCESSING KEY UP", event)
+        $emit('set-shortcut', {
+          key: event.key,
+          ctrlKey: event.ctrlKey,
+          metaKey: event.metaKey,
+          altKey: event.altKey,
+          shiftKey: event.shiftKey,
+          onKeyUp: true,
+          onKeyDown: false,
+        });
+      }
+      this.waitingForPress = false;
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>