diff --git a/src/App.vue b/src/App.vue
index 49386b8..96b73a9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -69,8 +69,8 @@
       </main>
 
       <footer class="app_footer">
-        &copy;&nbsp;
-        <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>&nbsp;
+        &copy;
+        <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>
         {{ new Date().getUTCFullYear() }} | v{{ VERSION }}
       </footer>
     </div>
diff --git a/src/components/JournalView/JournalDispatchers.vue b/src/components/JournalView/JournalDispatchers.vue
index defea2a..5168856 100644
--- a/src/components/JournalView/JournalDispatchers.vue
+++ b/src/components/JournalView/JournalDispatchers.vue
@@ -258,13 +258,15 @@ export default defineComponent({
     handleScroll() {
       this.showReturnButton = window.scrollY > window.innerHeight;
 
+      console.log(window.scrollY > window.innerHeight);
+
       const element = this.$refs.scrollElement as HTMLElement;
 
       if (
         element.getBoundingClientRect().bottom * 0.85 < window.innerHeight &&
         this.scrollDataLoaded &&
         !this.scrollNoMoreData &&
-        window.scrollY > window.innerHeight
+        this.historyDataStatus.status == DataStatus.Loaded
       )
         this.addHistoryData();
     },
diff --git a/src/components/JournalView/JournalTimetables.vue b/src/components/JournalView/JournalTimetables.vue
index c2a8ede..bb59f43 100644
--- a/src/components/JournalView/JournalTimetables.vue
+++ b/src/components/JournalView/JournalTimetables.vue
@@ -297,7 +297,7 @@ export default defineComponent({
         element.getBoundingClientRect().bottom * 0.85 < window.innerHeight &&
         this.scrollDataLoaded &&
         !this.scrollNoMoreData &&
-        window.scrollY > window.innerHeight
+        this.historyDataStatus.status == DataStatus.Loaded
       )
         this.addHistoryData();
     },
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index aacd6ea..6e18f28 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -1,5 +1,9 @@
 <template>
   <section class="station_table">
+    <button class="return-btn" @click="scrollToTop" v-if="showReturnButton">
+      <img :src="icons.arrow" alt="return arrow" />
+    </button>
+
     <div class="table_wrapper">
       <table>
         <thead>
@@ -231,6 +235,7 @@
 import styleMixin from '@/mixins/styleMixin';
 import dateMixin from '@/mixins/dateMixin';
 import stationInfoMixin from '@/mixins/stationInfoMixin';
+import returnBtnMixin from '@/mixins/returnBtnMixin';
 
 import { DataStatus } from '@/scripts/enums/DataStatus';
 import { computed, ComputedRef, defineComponent } from '@vue/runtime-core';
@@ -255,7 +260,7 @@ export default defineComponent({
     changeSorter: { type: Function, required: true },
   },
 
-  mixins: [styleMixin, dateMixin, stationInfoMixin],
+  mixins: [styleMixin, dateMixin, stationInfoMixin, returnBtnMixin],
 
   data: () => ({
     likeIcon: require('@/assets/icon-like.svg'),
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index 054344f..b7932ae 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -1,5 +1,9 @@
 <template>
   <div class="train-table" @keydown.esc="closeTimetable" v-click-outside="closeTimetable">
+    <button class="return-btn" @click="scrollToTop" v-if="showReturnButton">
+      <img :src="icons.arrowAsc" alt="return arrow" />
+    </button>
+
     <transition name="anim" mode="out-in">
       <div :key="trainsDataStatus">
         <!-- <div class="traffic-warning" v-if="data.">
@@ -45,6 +49,7 @@ import TrainInfo from '@/components/TrainsView/TrainInfo.vue';
 
 import { DataStatus } from '@/scripts/enums/DataStatus';
 import { GETTERS } from '@/constants/storeConstants';
+import returnBtnMixin from '@/mixins/returnBtnMixin';
 
 export default defineComponent({
   components: {
@@ -52,6 +57,8 @@ export default defineComponent({
     TrainInfo,
   },
 
+  mixins: [returnBtnMixin],
+
   props: {
     trains: {
       type: Array as () => Train[],
@@ -107,9 +114,9 @@ export default defineComponent({
       this.searchedDriver = query.driverName.toString();
       this.searchedTrain = query.trainNo.toString();
 
-        setTimeout(() => {
-          this.chosenTrainId = query.driverName + <string>query.trainNo;
-        }, 20);
+      setTimeout(() => {
+        this.chosenTrainId = query.driverName + <string>query.trainNo;
+      }, 20);
     }
   },
 
diff --git a/src/mixins/returnBtnMixin.ts b/src/mixins/returnBtnMixin.ts
new file mode 100644
index 0000000..7ba8e7f
--- /dev/null
+++ b/src/mixins/returnBtnMixin.ts
@@ -0,0 +1,31 @@
+import { defineComponent, h } from "vue";
+
+export default defineComponent({
+    data() {
+        return {
+            icons: {
+                arrow: require('@/assets/icon-arrow-asc.svg'),
+            },
+
+            showReturnButton: false
+        }
+    },
+
+    methods: {
+        scrollToTop() {
+            window.scrollTo({ top: 0 });
+        },
+
+        handleScroll() {
+            this.showReturnButton = window.scrollY > window.innerHeight;            
+        }
+    },
+
+    activated() {
+        window.addEventListener('scroll', this.handleScroll);
+    },
+
+    deactivated() {
+        window.removeEventListener('scroll', this.handleScroll);
+    },
+})
\ No newline at end of file
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 0652f64..6a41982 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -259,7 +259,7 @@ ul {
   bottom: 0;
 
   z-index: 100;
-
+  
   margin: 0 1em 1em 0;
 
   width: 2em;