diff --git a/admin/css/screen.css b/admin/css/screen.css
index 6a8a9e6dc..7aff9ad6d 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -145,7 +145,9 @@ body, html { font-size: 12px; line-height: 16px; font-family: Arial, sans-serif;
 /** ---------------------------------------------------- Basic form fields ---------------------------------------------------- */
 form.nostyle .field { padding: 0; border: 0; }
 form.nostyle label { float: none; width: auto; }
+form.nostyle label.left { float: none; display: inherit; width: auto; padding: 0; line-height: inherit; }
 form.nostyle .middleColumn { margin-left: 0; }
+form.nostyle input.text, form.nostyle textarea, form.nostyle select, form.nostyle .TreeDropdownField { width: auto; max-width: auto; }
 
 .field { display: block; padding: 10px 0; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); padding: 0 0 7px 0; margin: 0 0 8px 0; *zoom: 1; }
 .field:last-child { border-bottom: none; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; }
diff --git a/admin/scss/_mixins.scss b/admin/scss/_mixins.scss
index 3e137dbb4..6d134ee89 100644
--- a/admin/scss/_mixins.scss
+++ b/admin/scss/_mixins.scss
@@ -36,11 +36,27 @@
 	label {
 		float: none;
 		width: auto;
+
+		&.left {
+			float: none;
+			display: inherit;
+			width: auto;
+			padding: 0;
+			line-height: inherit;
+		}
 	}
 
 	.middleColumn {
 		margin-left: 0;
 	}
+
+	input.text,
+	textarea,
+	select,
+	.TreeDropdownField {
+		width: auto;
+		max-width: auto;
+	}
 }
 
 /** ----------------------------------------------------