diff --git a/less/selectlist.less b/less/selectlist.less
index 2b8a583e8..6a6168545 100644
--- a/less/selectlist.less
+++ b/less/selectlist.less
@@ -1,3 +1,7 @@
+/* TODO use bs base variables if possible */
+@selectlist-horizontal-padding: 12px;
+@selectlist-caret-width: 4px;
+
 .selectlist {
 
 	&.disabled {
@@ -13,15 +17,13 @@
 		min-width: inherit;
 	}
 	.btn.dropdown-toggle {
-		white-space: normal;
+		text-align: left;
+		padding-right: 2 * @selectlist-horizontal-padding + @selectlist-caret-width;
 
-		.selected-label {
-			padding-right: 18px;
-			float: left;
-		}
 		.caret {
 			.vertical-align();
-			right: @btnPaddingHorizontal;
+			right: @selectlist-horizontal-padding;
+
 		}
 	}
-}
\ No newline at end of file
+}