diff --git a/include/layout.js b/include/layout.js
index ed8cd30dd..7a92087ab 100644
--- a/include/layout.js
+++ b/include/layout.js
@@ -410,14 +410,14 @@ function applySkin() {
 		theme = 'classic';
 
 		// debounce submits
-		$('input[type="submit"], button[type="submit"]').click(function() {
+		$('input[type="submit"], button[type="submit"]').not('.import, .export').click(function() {
 			$(this).prop('disabled', true);
 		});
 	}else{
 		$('input[type=submit], input[type=button]').button();
 
 		// debounce submits
-		$('input[type="submit"], button[type="submit"]').click(function() {
+		$('input[type="submit"], button[type="submit"]').not('.import, .export').click(function() {
 			$(this).button('disable');
 		});
 	}
diff --git a/lib/html_form.php b/lib/html_form.php
index b86e77a89..ca776d253 100644
--- a/lib/html_form.php
+++ b/lib/html_form.php
@@ -1108,7 +1108,7 @@ function form_save_button($cancel_url, $force_type = '', $key_field = 'id', $aja
 			<td class='saveRow'>
 				<input type='hidden' name='action' value='save'>
 				<?php print $cancel_action;?>
-				<input id='submit' type='submit' value='<?php print $alt;?>'>
+				<input class='<?php print $force_type;?>' id='submit' type='submit' value='<?php print $alt;?>'>
 			</td>
 		</tr>
 	</table>