diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index b17e681e3e..0ea6e663fb 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -408,6 +408,7 @@ ul.et2_selectbox {
 /* padding between selectbox/textbox and it's label */
 input, select {
 	padding-left: 5px;
+	max-width: 99% !important;
 }
 .et2_selectbox li {
   text-decoration: none;
@@ -503,6 +504,8 @@ action buttons, left aligned for "extra" controls
 .et2_customfield_list {
 	width: 100%;
 }
+.et2_customfield_list tr td:first-child {width:30%;}
+
 .et2_customfield_list input, .et2_customfield_list textarea {
 	max-width: 100ex;
 }