diff --git a/src/jquery.contextMenu.js b/src/jquery.contextMenu.js
index e190458b..7950722f 100755
--- a/src/jquery.contextMenu.js
+++ b/src/jquery.contextMenu.js
@@ -353,9 +353,12 @@
             },
             // contextMenu left-click trigger
             click: function (e) {
+                var $this = $(this);
+                if ($this.hasClass('context-menu-disabled') || $(e.delegateTarget).hasClass('context-menu-disabled'))
+                    return
                 e.preventDefault();
                 e.stopImmediatePropagation();
-                $(this).trigger($.Event('contextmenu', {data: e.data, pageX: e.pageX, pageY: e.pageY}));
+                $this.trigger($.Event('contextmenu', {data: e.data, pageX: e.pageX, pageY: e.pageY}));
             },
             // contextMenu right-click trigger
             mousedown: function (e) {
@@ -1706,7 +1709,8 @@
                         }
 
                         // Is this menu equest to the context called from
-                        if (!$(context).is(o.selector)) {
+                        var $context = $(context);
+                        if (!($context.is(o.selector) || $context.has(o.selector))) {
                             return true;
                         }