diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 279163d64b..c817c5ddd7 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -4,35 +4,12 @@
 // Container styles
 // --------------------------------------------------
 .umb-property-editor {
-    @media (max-width: 800px) {
-        width: 100%;
-    }
-    @media (min-width: 800px) {
-      min-width:66.6%;
-    }
-
-	&-pull {
-		float:left;
-		width:66.6%;
-	}
-
-	&-push {
-		float:right;
-    }
-
-    &--list{
-        float: left;
-    }
-
-    &__item{
-        line-height: 1;
-        margin: 0 0 5px;
-    }
+    width: 100%;
 }
 
 .umb-property-editor-tiny {
-  width: 60px;
-
+    width: 60px;
+    
 	&.umb-editor-push {
 		width:30%;
 		min-width:0;
@@ -87,6 +64,10 @@
 //
 // Content picker
 // --------------------------------------------------
+.umb-contentpicker {
+    .umb-property-editor--limit-width();
+}
+
 .umb-contentpicker li a:hover .hover-hide, .umb-contentpicker li a .hover-show{
   display: none;
 }
@@ -856,6 +837,8 @@
     padding: 10px;
     font-size: 13px;
     text-shadow: none;
+    box-sizing: border-box;
+    .umb-property-editor--limit-width();
 
     .tag {
         cursor: default;