diff --git a/css/app.css b/css/app.css
index f561a9d34..5c7d7de80 100644
--- a/css/app.css
+++ b/css/app.css
@@ -2693,7 +2693,7 @@ img.wiki-image {
     border-bottom-color: #000;
 }
 
-.map-overlay .tooltip.left .tooltip-arrow
+.map-overlay .tooltip.left .tooltip-arrow,
 .entity-editor-pane .tooltip.left .tooltip-arrow {
     border-left-color: #000;
 }
diff --git a/js/id/ui/background.js b/js/id/ui/background.js
index 9bc6d813b..c80c3f1ff 100644
--- a/js/id/ui/background.js
+++ b/js/id/ui/background.js
@@ -209,7 +209,7 @@ iD.ui.Background = function(context) {
             .on('click.set-opacity', setOpacity)
             .html('<div class="select-box"></div>')
             .call(bootstrap.tooltip()
-                .placement('top'))
+                .placement('left'))
             .append('div')
             .attr('class', 'opacity')
             .style('opacity', String);
@@ -272,7 +272,7 @@ iD.ui.Background = function(context) {
         label = gpxLayerItem.append('label')
             .call(bootstrap.tooltip()
                 .title(t('gpx.drag_drop'))
-                .placement('left'));
+                .placement('top'));
 
         label.append('input')
             .attr('type', 'checkbox')