diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0dd9695fd..a57746b13 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -226,6 +226,16 @@ onUnmounted(async () => {
     if ($props.isEditable) document.removeEventListener('click', clickHandler);
 });
 
+watch(
+    mode,
+    (newMode) => {
+        if (newMode === CARD_MODE) {
+            showButton.value = false;
+        }
+    },
+    { immediate: true }
+);
+
 watch(
     () => $props.columns,
     (value) => splitColumns(value),
diff --git a/src/components/common/VnScroll.vue b/src/components/common/VnScroll.vue
index ab48bef3b..dc7f7eb3d 100644
--- a/src/components/common/VnScroll.vue
+++ b/src/components/common/VnScroll.vue
@@ -1,11 +1,16 @@
 <script setup>
 import { ref, onMounted, onUnmounted, watch } from 'vue';
 
+const props = defineProps({
+    scrollTarget: { type: [String, Object], default: 'window' } // Puede ser un selector o un ref
+});
+
 const scrollPosition = ref(0);
 const showButton = ref(false);
+let scrollContainer = null;
 
 const onScroll = () => {
-    scrollPosition.value = window.scrollY;
+    scrollPosition.value = scrollContainer.scrollTop || window.scrollY;
 };
 
 watch(scrollPosition, (newValue) => {
@@ -13,17 +18,24 @@ watch(scrollPosition, (newValue) => {
 });
 
 const scrollToTop = () => {
-    window.scrollTo({ top: 0, behavior: 'smooth' });
+    scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
 };
 
 onMounted(() => {
-    window.addEventListener('scroll', onScroll);
+    scrollContainer = props.scrollTarget === 'window' ? window : document.querySelector(props.scrollTarget);
+
+    if (scrollContainer) {
+        scrollContainer.addEventListener('scroll', onScroll);
+    }
 });
 
 onUnmounted(() => {
-    window.removeEventListener('scroll', onScroll);
+    if (scrollContainer) {
+        scrollContainer.removeEventListener('scroll', onScroll);
+    }
 });
 </script>
+
 <template>
     <QBtn
         v-if="showButton"
@@ -32,7 +44,9 @@ onUnmounted(() => {
         icon="arrow_upward"
         class="scroll-to-top"
         @click="scrollToTop"
-    />
+    >
+        <QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
+    </QBtn>
 </template>
 
 <style scoped>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 9e46c54e3..6605312b7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -6,6 +6,7 @@ globals:
     quantity: Quantity
     entity: Entity
     preview: Preview
+    scrollToTop: Go up
     user: User
     details: Details
     collapseMenu: Collapse lateral menu
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fd42d37c7..ab23da7c9 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -6,6 +6,7 @@ globals:
     quantity: Cantidad
     entity: Entidad
     preview: Vista previa
+    scrollToTop: Ir arriba
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral