diff --git a/NEWS.md b/NEWS.md
index b434000da2..91a6d29aa0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -71,6 +71,7 @@ sudo make install
 * Forward compatibility for infowindows at Builder
 * Several auth_token related fixes
 * New builder default geometry styles are now properly initialized at the backend upon dataset import.
+* Fixed list of layers in Add basemap WMS URL tab
 
 3.13.0 (2016-XX-XX)
 -------------------
diff --git a/app/assets/stylesheets/editor-3/custom-basemap-dialog.css.scss b/app/assets/stylesheets/editor-3/custom-basemap-dialog.css.scss
index b7f49f0130..f3f83840f1 100644
--- a/app/assets/stylesheets/editor-3/custom-basemap-dialog.css.scss
+++ b/app/assets/stylesheets/editor-3/custom-basemap-dialog.css.scss
@@ -23,6 +23,7 @@
 .WMSSSelectLayer-Filter {
   width: 900px;
   margin: auto;
+  margin-top: -42px;
   z-index: 0;
 }
 
diff --git a/app/assets/stylesheets/editor-3/scroll-view.css.scss b/app/assets/stylesheets/editor-3/scroll-view.css.scss
index 5b5cdbe5af..1f2cfbb3f7 100644
--- a/app/assets/stylesheets/editor-3/scroll-view.css.scss
+++ b/app/assets/stylesheets/editor-3/scroll-view.css.scss
@@ -25,6 +25,10 @@
   }
 }
 
+.ScrollView--with-navigation {
+  margin-top: 0;
+}
+
 .ScrollView--horizontal {
 
   &,
diff --git a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs.tpl b/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs.tpl
index 1afca9bfd0..b60277ed44 100644
--- a/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs.tpl
+++ b/lib/assets/javascripts/cartodb3/components/modals/add-basemap/tabs.tpl
@@ -10,9 +10,7 @@
   </ul>
 </div>
 <div class="Modal-inner Modal-inner--with-navigation">
-  <div class="ScrollView">
-    <div class="ScrollView-wrapper">
-      <div class="ScrollView-content js-tab-content"></div>
-    </div>
+  <div class="ScrollView ScrollView--with-navigation">
+    <div class="ScrollView-content js-tab-content"></div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/package.json b/package.json
index 7f5c928eac..1ed0beb9b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "4.5.10",
+  "version": "4.5.11",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",