diff --git a/public/js/manage_tables.js b/public/js/manage_tables.js
index 4cf918f33..d9eb205e2 100644
--- a/public/js/manage_tables.js
+++ b/public/js/manage_tables.js
@@ -15,17 +15,14 @@
 			const form = $('form', dlog_ref.$modalBody).first();
 			const validator = form.data('validator');
 			const submitted = validator && validator.formSubmitted;
-			const is_valid = !$.isEmptyObject(validator.invalid)
 
 			btn_id = button_id;
 			dialog_ref = dlog_ref;
 
-			if (button_id == 'submit' && is_valid && button_id != "btnNew"){
-				$('#submit').prop('disabled', true).css('opacity', 0.5);
-			}
-
 			if (button_id == 'submit' && (!submitted && btn_id != "btnNew")) {
 				form.submit();
+
+				validator.valid() && $('#submit').prop('disabled', true).css('opacity', 0.5);
 			}
 			return false;
 		}