diff --git a/src/KeyboardShortcut/KeyboardShortcut.xml b/src/KeyboardShortcut/KeyboardShortcut.xml
index 01dd66f..e0023a8 100644
--- a/src/KeyboardShortcut/KeyboardShortcut.xml
+++ b/src/KeyboardShortcut/KeyboardShortcut.xml
@@ -20,7 +20,13 @@ xTuWIvAW3RahaSYkTNI5xl6/3TpcVJ3lxR0OSj/J8qLAVvhTsydahIZvcYcpclyZqfzT55nHKKYe
 			<category>Behavior</category>
 			<description>Setting this to true limits the listening to keyboard events if the key is pressed when focus is at an element which is within this container.
 			</description>
-		</property>
+	</property>
+	<property key="limitScopeButton" type="boolean" required="true" defaultValue="false">
+			<caption>Limit scope Button scope</caption>
+			<category>Behavior</category>
+			<description>Setting this to true limits the triggering of the button to buttons with this container. Very useful for using this widget in a snippet that show multiple times on a page.
+			</description>
+	</property>
         <property key="shortcuts" type="object" isList= "true" required="false">
             <caption>Shortcuts</caption>
             <category>Shortcuts</category>
diff --git a/src/KeyboardShortcut/widget/KeyboardShortcut.js b/src/KeyboardShortcut/widget/KeyboardShortcut.js
index 80840fc..503afb2 100644
--- a/src/KeyboardShortcut/widget/KeyboardShortcut.js
+++ b/src/KeyboardShortcut/widget/KeyboardShortcut.js
@@ -31,6 +31,7 @@ define([
 		shortcuts: [],
 		disableInput: false,
 		limitScope: false,
+		limitScopeButton: false,
 
 
 		//internal variables
@@ -79,7 +80,7 @@ define([
 				var buttonsLength = buttons.length;
 				for (var i = 0; i < buttonsLength; i++) {
                     button = buttons[i];
-					if (button.offsetHeight != 0) {
+					if (button.offsetHeight != 0 && (!self.limitScopeButton || scope.contains(button))) {
 						chosenButton = button;
 						break;
 					}
diff --git a/src/package.xml b/src/package.xml
index ca1dd4d..5ed3428 100644
--- a/src/package.xml
+++ b/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="KeyboardShortcut" version="2.0.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="KeyboardShortcut" version="2.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="KeyboardShortcut/KeyboardShortcut.xml" />
         </widgetFiles>
@@ -8,4 +8,4 @@
             <file path="KeyboardShortcut/widget/" />
         </files>
     </clientModule>
-</package>
\ No newline at end of file
+</package>