diff --git a/README.md b/README.md
index 4a5b7be9..3ddc081d 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## list of changes in this fork:
 - additional confirmations for:
     - post visibility (choose direct, private, unlisted, public, local)
-    - posting with an attachment marked sensitive but no cw
+    - posting with an attachment marked sensitive but no cw (todo: fix the conf showing up with no attachments)
 - biting:
     - users
     - notes
@@ -26,6 +26,7 @@
 - for unreads:
     - option to disable favicon badge changing on unreads
     - option to disable title showing unreads
+    - option to not scroll to the top when showing unreads
 - update the list of emojis:
     - switched weird unicode ones to proper emojis
     - emojis are sourced from discord's list of emojis
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index c0bf3489..ed3b3c3d 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -201,6 +201,14 @@
             </li>
           </ul>
         </li>
+        <li>
+          <BooleanSetting
+            path="scrollToTopOnNewPostClick"
+            expert="1"
+          >
+            {{ $t('settings.scroll_to_top_on_new_post_click') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="useStreamingApi"
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index cdb35e08..5b9074ee 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -7,6 +7,7 @@ import TimelineQuickSettings from './timeline_quick_settings.vue'
 import { debounce, throttle, keyBy } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch, faCog, faPlus, faMinus } from '@fortawesome/free-solid-svg-icons'
+import {calcLineCount} from "diff/lib/patch/merge";
 
 library.add(
   faCircleNotch,
@@ -156,6 +157,8 @@ const Timeline = {
       if (e.key === '.') this.showNewStatuses()
     },
     showNewStatuses () {
+      let bef = document.getElementsByClassName("Timeline")[0].scrollHeight
+
       if (this.timeline.flushMarker !== 0) {
         this.$store.commit('clearTimeline', { timeline: this.timelineName, excludeUserId: true })
         this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
@@ -165,8 +168,18 @@ const Timeline = {
         this.$store.commit('showNewStatuses', { timeline: this.timelineName })
         this.paused = false
       }
-      if (!this.inProfile) {
+      if (!this.inProfile && this.$store.getters.mergedConfig.scrollToTopOnNewPostClick) {
         window.scrollTo({ top: 0 })
+      } else if (!this.inProfile && !this.$store.getters.mergedConfig.scrollToTopOnNewPostClick && window.scrollY > 0) {
+        // i REALLY don't like this code. it results in flickering best case scenario. this is kind of just a limit
+        // of how akko-fe is written, and being able to do this without flicker would require an async rewrite most
+        // likely. this is probably the best way this can be reasonably done without a full rewrite.
+        setTimeout(function() {
+          let after = document.getElementsByClassName("Timeline")[0].scrollHeight
+          let diff = bef - after
+          if (diff < 0) diff = diff * -1
+          window.scrollTo({ top: (window.scrollY + diff) })
+        }, 0);
       }
     },
     fetchOlderStatuses: throttle( function () {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d024dffd..aa69983a 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -753,6 +753,7 @@
         "saving_err": "Error saving settings",
         "saving_ok": "Settings saved",
         "scope_copy": "Copy scope when replying (DMs are always copied)",
+        "scroll_to_top_on_new_post_click": "Scroll to the top when showing new posts (disabling this may result in buggy behavior)",
         "search_pagination_limit": "Results to show per search page",
         "search_user_to_block": "Search whom you want to block",
         "search_user_to_mute": "Search whom you want to mute",
diff --git a/src/modules/config.js b/src/modules/config.js
index efed69b4..777f052b 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -128,6 +128,7 @@ export const defaultState = {
   recurseSearch: false,
   recurseSearchLimit: 100,
   dedupeBoosts: true,
+  scrollToTopOnNewPostClick: true,
   showFaviconBadge: true,
   autoRefreshOnRequired: true,
   showUnreadInTitle: true,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 75dd6aa7..6477d9b1 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -84,6 +84,7 @@ const defaultState = {
   recurseSearch: false,
   recurseSearchLimit: 100,
   dedupeBoosts: true,
+  scrollToTopOnNewPostClick: true,
   showFaviconBadge: true,
   autoRefreshOnRequired: true,
   showUnreadInTitle: true,