diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 90d47a20c..7ac662e13 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -1,5 +1,6 @@
 <% labelled_fields_for :issue, @issue do |f| %>
 
+<div class="splitcontent">
 <div class="splitcontentleft">
 <% if @issue.safe_attribute? 'status_id'  %>
 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
@@ -58,8 +59,8 @@
 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
 <% end %>
 </div>
+</div>
 
-<div style="clear:both;"> </div>
 <% if @issue.safe_attribute? 'custom_field_values' %>
 <%= render :partial => 'issues/form_custom_fields' %>
 <% end %>
diff --git a/app/views/issues/_form_custom_fields.html.erb b/app/views/issues/_form_custom_fields.html.erb
index 10539264c..33b0b848b 100644
--- a/app/views/issues/_form_custom_fields.html.erb
+++ b/app/views/issues/_form_custom_fields.html.erb
@@ -1,3 +1,4 @@
+<div class="splitcontent">
 <div class="splitcontentleft">
 <% i = 0 %>
 <% split_on = (@issue.custom_field_values.size / 2.0).ceil - 1 %>
@@ -9,4 +10,4 @@
 <% i += 1 -%>
 <% end -%>
 </div>
-<div style="clear:both;"> </div>
+</div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 98407afc4..b7cd41da9 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -280,6 +280,7 @@ div.square {
 .contextual input, .contextual select {font-size:0.9em;}
 .message .contextual { margin-top: 0; }
 
+.splitcontent {overflow:auto;}
 .splitcontentleft{float:left; width:49%;}
 .splitcontentright{float:right; width:49%;}
 form {display: inline;}