diff --git a/calendar/js/app.js b/calendar/js/app.js
index d697a7038b..359b167353 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -2843,7 +2843,7 @@ app.classes.calendar = AppJS.extend(
 		var button = $j('#calendar-sidebox_owner ~ span.et2_clickable');
 		if(button.length == 1)
 		{
-			button.parent().width(button.parent().width() - button.width());
+			button.parent().css('margin-right',button.outerWidth(true)+2);
 			button.parent().parent().css('white-space','nowrap');
 		}
 	},
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 8553800e81..0737a63fab 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -19,9 +19,17 @@
 #calendar-sidebox_owner {
 	width: 90%;
 }
+#calendar-sidebox_owner ~ * {
+	vertical-align: top;
+	display: inline-block;
+}
 #calendar-sidebox_cat_id {
 	width: 90%;
 }
+#calendar-sidebox_cat_id ~ * {
+	vertical-align: top;
+	display: inline-block;
+}
 #calendar-sidebox_buttons tbody {
 	width: 100%;
 }