diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index f3a54119e78..02bd3069c59 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -64,7 +64,7 @@
 						self.$buttonrow.find($(event.target)).length === 0
 					) {
 						var $button = self.$buttonrow.find('button.primary');
-						if($button) {
+						if($button && !$button.prop('disabled')) {
 							$button.trigger('click');
 						}
 					} else if(self.$buttonrow) {