diff --git a/lib/mergely.js b/lib/mergely.js
index d875468..dc76621 100644
--- a/lib/mergely.js
+++ b/lib/mergely.js
@@ -732,7 +732,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 		function gutterClicked(side, line, ev) {
 			// The "Merge left/right" buttons are also located in the gutter.
 			// Don't interfere with them:
-			if(ev.target && (ev.target.className === 'merge-button')) {
+			if(ev.target && (ev.target.parentNode.className.indexOf('merge-button') >= 0)) {
 				return;
 			}
 
@@ -1320,7 +1320,7 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 		
 		// merge buttons
 		var ed = {lhs:led, rhs:red};
-		jQuery('.merge-button').on('click', function(ev){
+		this.element.find('.merge-button').on('click', function(ev){
 			// side of mouseenter
 			var side = 'rhs';
 			var oside = 'lhs';