diff --git a/css/app.css b/css/app.css
index 4d7195264..bc54a4cf4 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1293,6 +1293,14 @@ div.combobox {
     overflow: hidden;
 }
 
+.grid-pane .tag-reference-wrap {
+    padding: 10px 0 20px 0;
+}
+
+.tag-pane .tag-reference-wrap {
+    padding-top: 20px;
+}
+
 .additional-tags div.tag-help {
     border-left: 1px solid #ccc;
     border-right: 1px solid #ccc;
diff --git a/js/id/ui/tag_reference.js b/js/id/ui/tag_reference.js
index 87f88d0a4..d96af6de3 100644
--- a/js/id/ui/tag_reference.js
+++ b/js/id/ui/tag_reference.js
@@ -36,7 +36,7 @@ iD.ui.TagReference = function(entity, tag) {
         var referenceBody = wrap.selectAll('.tag-reference-wrap')
             .data([this])
             .enter().append('div')
-            .attr('class', 'tag-reference-wrap')
+            .attr('class', 'tag-reference-wrap cf')
             .style('opacity', 0);
 
         function show() {
@@ -80,11 +80,9 @@ iD.ui.TagReference = function(entity, tag) {
         });
 
         wrap.style('max-height', '0px')
-            .style('padding-top', '0px')
             .style('opacity', '0')
             .transition()
             .duration(200)
-            .style('padding-top', '20px')
             .style('max-height', '200px')
             .style('opacity', '1');
 
@@ -95,7 +93,6 @@ iD.ui.TagReference = function(entity, tag) {
         wrap.transition()
             .duration(200)
             .style('max-height', '0px')
-            .style('padding-top', '0px')
             .style('opacity', '0');
 
         showing = false;