diff --git a/app/assets/stylesheets/posts.scss b/app/assets/stylesheets/posts.scss
index a1a548af6..59e004d26 100644
--- a/app/assets/stylesheets/posts.scss
+++ b/app/assets/stylesheets/posts.scss
@@ -12,6 +12,11 @@
   }
 }
 
+.sticky {
+  position: sticky;
+  top: 50px;
+}
+
 .post--container {
   max-width: 100%;
 
diff --git a/app/views/posts/_expanded.html.erb b/app/views/posts/_expanded.html.erb
index 82733701f..7a6f2710f 100644
--- a/app/views/posts/_expanded.html.erb
+++ b/app/views/posts/_expanded.html.erb
@@ -38,44 +38,47 @@
   <div class="post--container <%= 'deleted-content' if post.deleted? %> grid is-nowrap">
     <% if post_type.has_votes %>
       <div>
-        <div class="post--votes has-text-align-center" title="Score : <%= post.score %>">
-          <% existing_vote = my_vote(post) %>
-          <% unless post.locked? %>
-            <button class="vote-button button is-icon-only-button <%= (existing_vote&.vote_type == 1) ? 'is-active' : '' %>"
-                    data-vote-type="1" data-vote-id="<%= existing_vote&.id %>" id="post-<%= post.id %>-up" aria-label="Upvote">
-                <svg width="2em" height="1.33em" viewbox="0 0 100 50">
-                  <path d="M50,0 L100,50 L0,50 Z" fill="currentColor" />
-                </svg>
-            </button>
-          <% end %>
-          <div class="score has-font-size-subheading js-upvote-count">
-            +<%= post.upvote_count %>
-          </div>
-          <div class="score has-font-size-subheading js-downvote-count">
-            &minus;<%= post.downvote_count %>
-          </div>
-          <% unless post.locked? %>
-            <button class="vote-button button is-icon-only-button <%= (existing_vote&.vote_type == -1) ? 'is-active' : '' %>"
-                    data-vote-type="-1" data-vote-id="<%= existing_vote&.id %>" id="post-<%= post.id %>-up" aria-label="Downvote">
-                <svg width="2em" height="1.33em" viewbox="0 0 100 50">
-                  <path d="M0,0 L100,0 L50,50 Z" fill="currentColor" />
-                </svg>
-            </button>
-          <% end %>
-        </div>
-        <% if user_signed_in? && post.post_type.has_reactions && post.post_type.reactions.any? %>
-          <div class="post--react has-text-align-center">
+        <% sticky_votes = user_preference('sticky_vote_tool', community: false) == 'true' %>
+        <div <% if sticky_votes then %> class="sticky" <% end %>>
+          <div class="post--votes has-text-align-center" title="Score : <%= post.score %>">
+            <% existing_vote = my_vote(post) %>
+            <% unless post.locked? %>
+              <button class="vote-button button is-icon-only-button <%= (existing_vote&.vote_type == 1) ? 'is-active' : '' %>"
+                      data-vote-type="1" data-vote-id="<%= existing_vote&.id %>" id="post-<%= post.id %>-up" aria-label="Upvote">
+                  <svg width="2em" height="1.33em" viewbox="0 0 100 50">
+                    <path d="M50,0 L100,50 L0,50 Z" fill="currentColor" />
+                  </svg>
+              </button>
+            <% end %>
+            <div class="score has-font-size-subheading js-upvote-count">
+              +<%= post.upvote_count %>
+            </div>
+            <div class="score has-font-size-subheading js-downvote-count">
+              &minus;<%= post.downvote_count %>
+            </div>
             <% unless post.locked? %>
-              <button class="react-button button is-muted is-icon-only-button h-fw-bold"
-                      id="post-<%= post.id %>-react" aria-label="Add Reaction"
-                      data-drop="#post-<%= post.id %>-reactions-panel"
-                      data-drop-self-class-toggle="is-active"
-                      data-drop-force-dir="down">
-                  react
+              <button class="vote-button button is-icon-only-button <%= (existing_vote&.vote_type == -1) ? 'is-active' : '' %>"
+                      data-vote-type="-1" data-vote-id="<%= existing_vote&.id %>" id="post-<%= post.id %>-up" aria-label="Downvote">
+                  <svg width="2em" height="1.33em" viewbox="0 0 100 50">
+                    <path d="M0,0 L100,0 L50,50 Z" fill="currentColor" />
+                  </svg>
               </button>
             <% end %>
           </div>
-        <% end %>
+          <% if user_signed_in? && post.post_type.has_reactions && post.post_type.reactions.any? %>
+            <div class="post--react has-text-align-center">
+              <% unless post.locked? %>
+                <button class="react-button button is-muted is-icon-only-button h-fw-bold"
+                        id="post-<%= post.id %>-react" aria-label="Add Reaction"
+                        data-drop="#post-<%= post.id %>-reactions-panel"
+                        data-drop-self-class-toggle="is-active"
+                        data-drop-force-dir="down">
+                    react
+                </button>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
       </div>
     <% end %>
 
@@ -148,9 +151,10 @@
         <% end %>
       <% end %>
 
-      <div class="post--body">
+      <article class="post--body">
         <%= raw(sanitize(post.body, scrubber: scrubber)) %>
-
+      </article>
+      <div>
         <% been_edited = post.last_edited_by_id != nil %>
         <% if been_edited then last_edited_by_self = post.user_id == post.last_edited_by_id end %>
 
diff --git a/config/config/preferences.yml b/config/config/preferences.yml
index 36be0760a..8ecdcaabb 100644
--- a/config/config/preferences.yml
+++ b/config/config/preferences.yml
@@ -72,4 +72,10 @@ sticky_header:
   type: boolean
   description: >
     Make the top navigation bar sticky.
+  default: false
+
+sticky_vote_tool:
+  type: boolean
+  description: >
+    Make the up and downvote buttons scroll along with the post
   default: false
\ No newline at end of file