diff --git a/CHANGELOG.md b/CHANGELOG.md
index 839f4622c..840d1c14b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [0.4.25] - 2019-01-10
+### Changed
+- Update dependencies
+
+### Fixed
+- Auto-scroll to more proper position
+
 ## [0.4.24] - 2019-01-06
 ### Changed
 - Update dependencies
@@ -175,7 +182,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Added
 - First release
 
-[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.24...HEAD
+[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.25...HEAD
+[0.4.25]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.24...v0.4.25
 [0.4.24]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.23...v0.4.24
 [0.4.23]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.22...v0.4.23
 [0.4.22]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.21...v0.4.22
diff --git a/package-lock.json b/package-lock.json
index c7f9e220d..e80421d5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "piping-ui",
-  "version": "0.4.24",
+  "version": "0.4.25",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2091,6 +2091,11 @@
         }
       }
     },
+    "@tokenizer/token": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.1.0.tgz",
+      "integrity": "sha512-fXk7a5R+aE8bfDRbfT+xRG2evSatjbljGGSUflfQmqw555My8II/EWly2GmcHaqXF5HCMitBEfSNhCRZCrLGGg=="
+    },
     "@types/bn.js": {
       "version": "4.11.5",
       "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.5.tgz",
@@ -2186,9 +2191,9 @@
       "dev": true
     },
     "@types/jszip": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@types/jszip/-/jszip-3.1.6.tgz",
-      "integrity": "sha512-m8uFcI+O2EupCfbEVQWsBM/4nhbegjOHL7cQgBpM95FeF98kdFJXzy9/8yhx4b3lCRl/gMBhcvyh30Qt3X+XPQ==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@types/jszip/-/jszip-3.1.7.tgz",
+      "integrity": "sha512-+XQKNI5zpxutK05hO67huUTw/2imXCuJWjnFdU63tRES/xXSX1yVR9cv/QAdO6Rii2y2tTHbzjQ4i2apLfuK0Q==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -6291,9 +6296,9 @@
       }
     },
     "core-js": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz",
-      "integrity": "sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ=="
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.2.tgz",
+      "integrity": "sha512-hIE5dXkRzRvnZ5vhkRfQxUvDxQZmD9oueA08jDYRBKJHx+VIl/Pne/e0A4x9LObEEthC/TqiZybUoNM4tRgnKg=="
     },
     "core-js-compat": {
       "version": "3.6.1",
@@ -6788,7 +6793,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
       "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
       "requires": {
         "ms": "^2.1.1"
       }
@@ -8358,9 +8362,15 @@
       "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw=="
     },
     "file-type": {
-      "version": "12.4.2",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz",
-      "integrity": "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg=="
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-13.0.3.tgz",
+      "integrity": "sha512-fe3+9mnMLbpP8nRQm/cJgehypv375SOFOXFdLYyYe7hWxdWgS5hkDpWnld5At/vvfVEN6rVqKA3EOKMP03tJGg==",
+      "requires": {
+        "readable-web-to-node-stream": "^2.0.0",
+        "strtok3": "^5.0.1",
+        "token-types": "^2.0.0",
+        "typedarray-to-buffer": "^3.1.5"
+      }
     },
     "filepond": {
       "version": "4.9.3",
@@ -9818,8 +9828,7 @@
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
     },
     "iferr": {
       "version": "0.1.5",
@@ -10297,8 +10306,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-url": {
       "version": "1.2.4",
@@ -11613,8 +11621,7 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "multi-stage-sourcemap": {
       "version": "0.2.1",
@@ -18790,6 +18797,11 @@
         "sha.js": "^2.4.8"
       }
     },
+    "peek-readable": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.0.tgz",
+      "integrity": "sha512-KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA=="
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -19924,6 +19936,11 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "readable-web-to-node-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-2.0.0.tgz",
+      "integrity": "sha512-+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="
+    },
     "readdir-scoped-modules": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
@@ -20370,9 +20387,9 @@
       }
     },
     "sass": {
-      "version": "1.24.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.24.2.tgz",
-      "integrity": "sha512-0JxdMMRd0fOmGFQFRI91vh4n0Ed766ib9JwPUa+1C37zn3VaqlHxbknUn/6LqP/MSfvNPxRYoCrYf5g8vu4OHw==",
+      "version": "1.24.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.24.4.tgz",
+      "integrity": "sha512-SqizkIEEcVPzmK1tYdlNRl/RSXMEwGcifL9GD+S2p9rEPdj6ycRbk4PWZs0jwlajNSyBPo/SXRB81i22SG0jmw==",
       "dev": true,
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"
@@ -21333,6 +21350,16 @@
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
       "dev": true
     },
+    "strtok3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-5.0.1.tgz",
+      "integrity": "sha512-AWliiIjyb87onqO8pM+1Hozm+PPcR4YYIWbFUT5OKQ+tOMwgdT8HwJd/IS8v3/gKdAtE5aE2p3FhcWqryuZPLQ==",
+      "requires": {
+        "@tokenizer/token": "^0.1.0",
+        "debug": "^4.1.1",
+        "peek-readable": "^3.1.0"
+      }
+    },
     "stylehacks": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
@@ -21619,6 +21646,15 @@
       "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
       "dev": true
     },
+    "token-types": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz",
+      "integrity": "sha512-WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw==",
+      "requires": {
+        "@tokenizer/token": "^0.1.0",
+        "ieee754": "^1.1.13"
+      }
+    },
     "toposort": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
@@ -21863,6 +21899,14 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
     "typescript": {
       "version": "3.7.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz",
diff --git a/package.json b/package.json
index ee2ff4b4f..b9ef52862 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "piping-ui",
-  "version": "0.4.24",
+  "version": "0.4.25",
   "private": true,
-  "author": "Ryo Ota <nwtgck@gmail.com> (https://github.com/nwtgck)",
+  "author": "Ryo Ota <nwtgck@nwtgck.org> (https://github.com/nwtgck)",
   "scripts": {
     "serve": "npm run generate-version && npm run copy-openpgp && vue-cli-service serve",
     "build": "npm run generate-version && npm run generate-sitemap && npm run generate-robots-txt && npm run copy-openpgp && vue-cli-service build",
@@ -21,9 +21,9 @@
     "@fortawesome/vue-fontawesome": "^0.1.9",
     "binconv": "github:nwtgck/binconv-npm#v0.1.1",
     "clipboard": "^2.0.4",
-    "core-js": "^3.6.1",
+    "core-js": "^3.6.2",
     "file-saver": "^2.0.2",
-    "file-type": "^12.4.2",
+    "file-type": "^13.0.3",
     "filepond": "^4.9.3",
     "jszip": "^3.2.2",
     "jwk-thumbprint": "^0.1.2",
@@ -48,7 +48,7 @@
     "@types/chai": "^4.2.7",
     "@types/clipboard": "^2.0.1",
     "@types/file-saver": "^2.0.1",
-    "@types/jszip": "^3.1.6",
+    "@types/jszip": "^3.1.7",
     "@types/mocha": "^5.2.7",
     "@types/openpgp": "^4.4.8",
     "@types/react": "^16.9.17",
@@ -73,7 +73,7 @@
     "license-checker": "^25.0.1",
     "material-design-icons-iconfont": "^5.0.1",
     "react": "^16.12.0",
-    "sass": "^1.24.2",
+    "sass": "^1.24.4",
     "sass-loader": "^7.3.1",
     "typescript": "^3.7.4",
     "vue-cli-plugin-vuetify": "^2.0.3",
diff --git a/src/App.vue b/src/App.vue
index b3110fa18..5960cffaf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app id="app">
-    <v-app-bar app>
+    <v-app-bar app ref="app_bar">
       <v-toolbar-title style="margin-right: 0.6em;">
         <!-- Show version on app title -->
         <v-tooltip bottom>
@@ -51,12 +51,15 @@ import { Component, Vue } from 'vue-property-decorator';
 const PipingUI = () => import('@/components/PipingUI.vue');
 const MenuContent = () => import('@/components/MenuContent.vue');
 const Licenses = () => import("@/components/Licenses.vue");
+import {makePromise} from "@/utils";
 import {VERSION} from '@/version';
 import {globalStore} from "@/vue-global";
 import {strings} from "@/strings";
 import {mdiCached, mdiDotsVertical} from "@mdi/js";
 import enableDarkTheme from "@/enable-dark-theme";
 
+const {promise: _appBarPromise, resolve: appBarPromiseResolver} = makePromise<Element>();
+export const appBarPromise = _appBarPromise;
 
 @Component({
   components: {
@@ -96,6 +99,11 @@ export default class App extends Vue {
     this.$vuetify.theme.dark = enableDarkTheme();
   }
 
+  mounted() {
+    // Resolve app bar element
+    appBarPromiseResolver((this.$refs['app_bar'] as Vue).$el);
+  }
+
   // TODO: Remove any
   showRefreshUI (e: any) {
     this.pwa.registration = e.detail;
diff --git a/src/components/DataDownloader.vue b/src/components/DataDownloader.vue
index 40c50b18a..f386838e9 100644
--- a/src/components/DataDownloader.vue
+++ b/src/components/DataDownloader.vue
@@ -101,8 +101,8 @@ export default class DataDownloader extends Vue {
 
   async mounted() {
     // Scroll to this element
-    // (base: https://stackoverflow.com/a/22292000/2885946)
-    this.$el.scrollIntoView({behavior: 'smooth'});
+    // NOTE: no need to add `await`
+    pipingUiUtils.scrollTo(this.$el);
 
     // Key exchange
     const keyExchangeRes = await pipingUiUtils.keyExchangeAndReceiveVerified(
diff --git a/src/components/DataUploader.vue b/src/components/DataUploader.vue
index b7d88448b..f36b2bb7c 100644
--- a/src/components/DataUploader.vue
+++ b/src/components/DataUploader.vue
@@ -236,8 +236,8 @@ export default class DataUploader extends Vue {
 
   async mounted() {
     // Scroll to this element
-    // (base: https://stackoverflow.com/a/22292000/2885946)
-    this.$el.scrollIntoView({behavior: 'smooth'});
+    // NOTE: no need to add `await`
+    pipingUiUtils.scrollTo(this.$el);
 
     switch (this.props.protection.type) {
       case 'raw':
diff --git a/src/components/DataViewer.vue b/src/components/DataViewer.vue
index 40a0fc38b..9b2aeb432 100644
--- a/src/components/DataViewer.vue
+++ b/src/components/DataViewer.vue
@@ -160,7 +160,7 @@ import urlJoin from 'url-join';
 import linkifyHtml from 'linkifyjs/html';
 const FileSaverAsync = () => import('file-saver');
 import Clipboard from 'clipboard';
-import fileType from 'file-type';
+import * as fileType from 'file-type/browser';
 import {blobToUint8Array} from 'binconv/dist/src/blobToUint8Array';
 import {uint8ArrayToBlob} from 'binconv/dist/src/uint8ArrayToBlob';
 import {mdiAlert, mdiCheck, mdiChevronDown, mdiContentSave, mdiCloseCircle, mdiEye, mdiEyeOff, mdiKey, mdiFeatureSearchOutline} from "@mdi/js";
@@ -295,8 +295,8 @@ export default class DataViewer extends Vue {
 
   async mounted() {
     // Scroll to this element
-    // (base: https://stackoverflow.com/a/22292000/2885946)
-    this.$el.scrollIntoView({behavior: 'smooth'});
+    // NOTE: no need to add `await`
+    pipingUiUtils.scrollTo(this.$el);
 
     // Setting for copying to clipboard
     new Clipboard((this.$refs.text_copy_button as Vue).$el, {
@@ -378,7 +378,7 @@ export default class DataViewer extends Vue {
       this.text = await utils.readBlobAsText(this.blob);
     } else {
       // Detect type of blob
-      const fileTypeResult = fileType(firstChunk);
+      const fileTypeResult = await fileType.fromBlob(new Blob([firstChunk]));
       if (fileTypeResult !== undefined) {
         const blobUrl = URL.createObjectURL(this.blob);
         if (fileTypeResult.mime.startsWith("image/")) {
diff --git a/src/piping-ui-utils.ts b/src/piping-ui-utils.ts
index 7a496215a..41e959a27 100644
--- a/src/piping-ui-utils.ts
+++ b/src/piping-ui-utils.ts
@@ -15,6 +15,7 @@ const swDownloadAsync = () => import("@/sw-download");
 const utilsAsync = () => import("@/utils");
 const jwkThumbprintAsync  = () => import("jwk-thumbprint");
 const uint8ArrayToStringAsync = () => import('binconv/dist/src/uint8ArrayToString').then(p => p.uint8ArrayToString);
+import {appBarPromise} from "@/App.vue";
 
 // Decrypt & Download
 export async function decryptingDownload(
@@ -223,3 +224,13 @@ export async function keyExchangeAndReceiveVerified(serverUrl: string, secretPat
     }
   }
 }
+
+/**
+ * Scroll to the specific element considering the app bar
+ * @param element
+ */
+export async function scrollTo(element: Element): Promise<void> {
+  const appBar = await appBarPromise;
+  const moveTop = element.getBoundingClientRect().y - appBar.clientHeight;
+  window.scrollBy({ top: moveTop, left: 0, behavior: 'smooth' });
+}
diff --git a/src/utils.ts b/src/utils.ts
index 7ed49d22a..1f45e6538 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -127,3 +127,16 @@ export async function sha256(input: string): Promise<string> {
 export function uint8ArrayToBase64(arr: Uint8Array): string {
   return btoa(String.fromCharCode(...arr));
 }
+
+/***
+ * Make a promise which can be resolved and rejected outside of the Promise constructor
+ */
+export function makePromise<T>(): {promise: Promise<T>, resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void} {
+  let resolve = (value?: T | PromiseLike<T>) => {};
+  let reject = () => {};
+  const promise = new Promise<T>((_resolve, _reject) => {
+    resolve = _resolve;
+    reject  = _reject;
+  });
+  return {promise, resolve, reject};
+}