diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue
index f3acb6d3f..28f86e261 100644
--- a/src/admin/components/lists/filters-list.vue
+++ b/src/admin/components/lists/filters-list.vue
@@ -17,7 +17,10 @@
         </div>
         <p v-if="isRepositoryLevel">{{ $i18n.get('info_repository_filters_inheritance') }}</p>
         <br>
-        <div class="columns">
+        <div
+                :style="{ height: 'calc(100vh - 6px - ' + columnsTopY + 'px)'}"
+                class="columns"
+                ref="filterEditionPageColumns">
             <div class="column">
                 <section 
                         v-if="activeFilterList.length <= 0 && !isLoadingFilters"
@@ -330,7 +333,8 @@ export default {
             newFilterIndex: 0,
             availableMetadata: [],
             filterTypes: [],
-            currentFilterTypePreview: undefined        
+            currentFilterTypePreview: undefined,
+            columnsTopY: 0        
         }
     },
     computed: {
@@ -609,6 +613,10 @@ export default {
         if (!this.isRepositoryLevel)
             this.$root.$emit('onCollectionBreadCrumbUpdate', [{ path: '', label: this.$i18n.get('filter') }]);
 
+        this.$nextTick(() => { 
+            this.columnsTopY = this.$refs.filterEditionPageColumns.getBoundingClientRect().top;
+        });
+
         this.isRepositoryLevel = this.$route.name == 'FiltersPage' ? true : false;
         if (this.isRepositoryLevel)
             this.collectionId = 'default';
@@ -666,6 +674,7 @@ export default {
     @import "../../scss/_variables.scss";
 
     .filters-list-page {
+        padding-bottom: 0;
 
         .tainacan-page-title {
             margin-bottom: 40px;
@@ -696,9 +705,18 @@ export default {
             }
         }
                     
-        .column:not(.available-metadata-area){
-            overflow: hidden;
-            flex-grow: 2;
+        .column {
+            overflow-x: hidden;
+            overflow-y: auto;
+
+            &:not(.available-metadata-area){
+                margin-right: $page-side-padding;
+                flex-grow: 2;
+
+                @media screen and (max-width: 769px) {
+                    margin-right: 0;
+                }
+            }
         }
 
         .loading-spinner {
@@ -715,9 +733,9 @@ export default {
 
         .active-filters-area {
             font-size: 14px;
-            margin-right: 0.8em;
-            margin-left: -0.8em;
-            padding-right: 6em;
+            margin-right: 0.8rem;
+            margin-left: -0.8rem;
+            padding-right: 3rem;
             min-height: 330px;
 
             @media screen and (max-width: 769px) {
@@ -888,13 +906,13 @@ export default {
             }
 
             h3 {
-                margin: 0.2em 0em 1em -1.2em;
+                margin: 0.2rem 0rem 1rem 0rem;
                 font-weight: 500;
             }
 
             .available-metadatum-item {
                 padding: 0.7em;
-                margin: 4px;
+                margin: 4px 4px 4px 1.2rem;
                 background-color: white;
                 cursor: pointer;
                 left: 0;
diff --git a/src/admin/components/lists/metadata-list.vue b/src/admin/components/lists/metadata-list.vue
index b3fe8d39f..e9d71b377 100644
--- a/src/admin/components/lists/metadata-list.vue
+++ b/src/admin/components/lists/metadata-list.vue
@@ -20,7 +20,10 @@
         <br>
         <b-tabs v-model="activeTab">    
             <b-tab-item :label="$i18n.get('metadata')">
-                <div class="columns">
+                <div
+                        :style="{ height: 'calc(100vh - 6px - ' + columnsTopY + 'px)'}"
+                        class="columns"
+                        ref="metadataEditionPageColumns">
                     <div class="column"> 
                         <section 
                                 v-if="activeMetadatumList.length <= 0 && !isLoadingMetadata"
@@ -233,10 +236,8 @@
             </b-tab-item>
 
             <!-- Exposer --------------- -->
-            <b-tab-item
-                    :label="$i18n.get('mapping')"
-                    v-model="activeMetadatumList">
-                <div class="active-metadata-area">
+            <b-tab-item :label="$i18n.get('mapping')">
+                <div>
                     <section 
                             v-if="activeMetadatumList.length <= 0 && !isLoadingMetadata"
                             class="field is-grouped-centered section">
@@ -254,11 +255,12 @@
                         <div class="field is-grouped form-submit">
                             <b-select
                                     id="mappers-options-dropdown"
-                                    :placeholder="$i18n.get('instruction_select_a_mapper')">
+                                    :placeholder="$i18n.get('instruction_select_a_mapper')"
+                                    @input="onSelectMetadataMapper($event)">
                                 <option
                                         v-for="metadatum_mapper in metadatum_mappers"
                                         :key="metadatum_mapper.slug"
-                                        @click="onSelectMetadataMapper(metadatum_mapper)">
+                                        :value="metadatum_mapper">
                                     {{ $i18n.get(metadatum_mapper.name) }}
                                 </option>
                             </b-select>
@@ -458,7 +460,8 @@ export default {
             newMapperMetadataList: [],
             new_metadata_label: '',
             new_metadata_uri: '',
-            new_metadata_slug: ''
+            new_metadata_slug: '',
+            columnsTopY: 0
         }
     },
     components: {
@@ -644,6 +647,7 @@ export default {
             this.openedMetadatumId = '';
         },
         onSelectMetadataMapper(metadatum_mapper) {
+
             this.isMapperMetadataLoading = true;
             this.mapper = metadatum_mapper; //TODO try to use v-model again
             this.mapperMetadata = [];
@@ -861,6 +865,10 @@ export default {
         if (!this.isRepositoryLevel)
             this.$root.$emit('onCollectionBreadCrumbUpdate', [{ path: '', label: this.$i18n.get('metadata') }]);
 
+        this.$nextTick(() => { 
+            this.columnsTopY = this.$refs.metadataEditionPageColumns.getBoundingClientRect().top;
+        });
+
         this.cleanMetadata();
         this.isLoadingMetadatumTypes = true;
         this.isLoadingMetadata = true;
@@ -896,6 +904,7 @@ export default {
     @import "../../scss/_variables.scss";
 
     .metadata-list-page {
+        padding-bottom: 0;
 
         .tainacan-page-title {
             margin-bottom: 40px;
@@ -930,10 +939,19 @@ export default {
             overflow: visible;
             min-height: 500px;
         }
-                  
-        .column:not(.available-metadata-area){
-            overflow: hidden;
-            flex-grow: 2;
+
+        .column {
+            overflow-x: hidden;
+            overflow-y: auto;
+
+            &:not(.available-metadata-area){
+                margin-right: $page-side-padding;
+                flex-grow: 2;
+
+                @media screen and (max-width: 769px) {
+                    margin-right: 0;
+                }
+            }
         }
 
         .page-title {
@@ -969,9 +987,9 @@ export default {
 
         .active-metadata-area {
             font-size: 14px;
-            margin-right: 0.8em;
-            margin-left: -0.8em;
-            padding-right: 6em;
+            margin-right: 0.8rem;
+            margin-left: -0.8rem;
+            padding-right: 3rem;
             min-height: 330px;
 
             @media screen and (max-width: 769px) {
@@ -1133,13 +1151,13 @@ export default {
             }
 
             h3 {
-                margin: 0.2em 0em 1em -1.2em;
+                margin: 0.2rem 0rem 1rem 0rem;
                 font-weight: 500;
             }
 
             .available-metadatum-item {
                 padding: 0.7em;
-                margin: 4px;
+                margin: 4px 4px 4px 1.2rem;
                 background-color: white;
                 cursor: pointer;
                 left: 0;
@@ -1169,7 +1187,7 @@ export default {
                     overflow-x: hidden;
                     white-space: nowrap;
                     font-weight: bold;
-                    margin-left: 0.4em;
+                    margin-left: 0.4rem;
                     display: inline-block;
                     max-width: 180px;
                     width: 60%;