diff --git a/gadjo/static/css/_forms.scss b/gadjo/static/css/_forms.scss
index b9bc01f..3113545 100644
--- a/gadjo/static/css/_forms.scss
+++ b/gadjo/static/css/_forms.scss
@@ -113,6 +113,15 @@ a.cancel-button, button.cancel-button, div.buttons .cancel-button input, div.but
 	&:active { border-color: darken($button-cancel-color, 10%); }
 }
 
+div.buttons {
+	display: flex;
+	// always force cancel button to be last
+	a.cancel {
+		order: 100;
+		margin-left: 1em;
+	}
+}
+
 a.delete-button, button.delete-button, div.buttons .delete-button input, div.buttons .delete-button button {
 	color: $button-delete-color;
 	border-color: $button-delete-color;
diff --git a/gadjo/static/css/_jqueryui.scss b/gadjo/static/css/_jqueryui.scss
index 403b18b..cb4671b 100644
--- a/gadjo/static/css/_jqueryui.scss
+++ b/gadjo/static/css/_jqueryui.scss
@@ -192,9 +192,14 @@ div.ui-dialog {
 		padding: 0.3em 1em 0.5em 0.4em;
 		.ui-dialog-buttonset {
 			float: right;
+			display: flex;
 		}
 		button {
 			margin: 0.5em 0 0.5em 1em;
+			&.cancel-button {
+				// always force cancel button to be secondary
+				order: -1;
+			}
 		}
 	}