diff --git a/changelog.md b/changelog.md
index 3b2f27ab..84c18a33 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,8 +2,10 @@
 #### Release date: 9. May 2022
 - Ability to manually synchronize plans in fixed subscription type
 - Improved sanitization for .env values to prevent crash your app
-- Improved reCaptcha validation error logs
+- Improved reCaptcha validation errors
 - Fixed issue when upload doesn't start after you drag the file into empty view
+- Fixed issue when homepage flash to sign in screen after the homepage was disabled in admin panel
+- Fixed trash navigator issue
 
 ## Version 2.1.2
 #### Release date: 8. May 2022
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 0c641c1c..85baf969 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -54,7 +54,7 @@
     "/chunks/demo.js": "/chunks/demo.js?id=355303e4230cb5ae",
     "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=c26cb144101e7c79",
     "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=170d814982e1c475",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=7df09dc197730821",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=d7f20b6ed737e969",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=2af6073efe54c560",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=27cda9364b6593d8",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=2f0401ee2fc148c4",
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index 789f24a8..322822ec 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -427,6 +427,12 @@ const FunctionHelpers = {
         }
 
         Vue.prototype.$goToFileView = function (id) {
+            // If user is located in trash, then automatically after click on the navigator go to the Files view
+            if (this.$router.currentRoute.name === 'Trash') {
+                this.$router.push({ name: 'Files', params: { id: id } })
+                return
+            }
+
             let locations = {
                 RequestUpload: {name: 'RequestUpload', params: { token: this.$route.params.token, id: id }},
                 Public: {name: 'Public', params: { token: this.$route.params.token, id: id }},