diff --git a/data/style.css b/data/style.css
index 876832a95..5ccf6dbc5 100644
--- a/data/style.css
+++ b/data/style.css
@@ -485,3 +485,6 @@ video > overlay > revealer > controls {
 	margin: 0px;
 }
 
+.compose-button {
+	padding: 8px;
+}
diff --git a/data/ui/views/base.ui b/data/ui/views/base.ui
index 882e99d4a..28f2b6d76 100644
--- a/data/ui/views/base.ui
+++ b/data/ui/views/base.ui
@@ -13,23 +13,28 @@
       <object class="AdwToolbarView" id="toolbar_view">
 
         <child type="top">
-          <object class="AdwHeaderBar" id="header"/>
+          <object class="AdwHeaderBar" id="header" />
         </child>
 
         <property name="content">
           <object class="GtkOverlay" id="scrolled_overlay">
             <child type="overlay">
-              <object class="GtkButton" id="scroll_to_top">
-                <property name="icon-name">go-top-symbolic</property>
+              <object class="GtkRevealer" id="scroll_to_top_rev">
+                <property name="transition_type">crossfade</property>
+                <property name="reveal-child">0</property>
                 <property name="valign">end</property>
                 <property name="halign">end</property>
                 <property name="margin_end">16</property>
                 <property name="margin_bottom">16</property>
-                <property name="visible">0</property>
-                <style>
-                  <class name="circular" />
-                  <class name="osd" />
-                </style>
+                <property name="child">
+                  <object class="GtkButton" id="scroll_to_top">
+                    <property name="icon-name">go-top-symbolic</property>
+                    <style>
+                      <class name="circular" />
+                      <class name="osd" />
+                    </style>
+                  </object>
+                </property>
               </object>
             </child>
 
@@ -172,4 +177,4 @@
     </child>
 
   </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/src/Views/Base.vala b/src/Views/Base.vala
index 3658919e7..c6cb69a67 100644
--- a/src/Views/Base.vala
+++ b/src/Views/Base.vala
@@ -33,6 +33,7 @@ public class Tuba.Views.Base : Adw.BreakpointBin {
 
 	[GtkChild] protected unowned Gtk.ScrolledWindow scrolled;
 	[GtkChild] protected unowned Gtk.Overlay scrolled_overlay;
+	[GtkChild] protected unowned Gtk.Revealer scroll_to_top_rev;
 	[GtkChild] protected unowned Gtk.Button scroll_to_top;
 	//  [GtkChild] protected unowned Gtk.Box view;
 	//  [GtkChild] protected unowned Adw.Clamp clamp;
diff --git a/src/Views/ContentBase.vala b/src/Views/ContentBase.vala
index af46d9b94..8dd333c88 100644
--- a/src/Views/ContentBase.vala
+++ b/src/Views/ContentBase.vala
@@ -21,26 +21,28 @@ public class Tuba.Views.ContentBase : Views.Base {
 		content_box.child = content;
 		content.activate.connect (on_content_item_activated);
 
-		scrolled.vadjustment.value_changed.connect (() => {
-			if (
-				!bottom_reached_locked
-				&& scrolled.vadjustment.value > scrolled.vadjustment.upper - scrolled.vadjustment.page_size * 2
-			) {
-				bottom_reached_locked = true;
-				on_bottom_reached ();
-			}
-
-			var is_close_to_top = scrolled.vadjustment.value <= 1000;
-			scroll_to_top.visible = !is_close_to_top
-				&& scrolled.vadjustment.value + scrolled.vadjustment.page_size + 100 < scrolled.vadjustment.upper;
-
-			if (is_close_to_top) reached_close_to_top ();
-		});
+		scrolled.vadjustment.value_changed.connect (on_scrolled_vadjustment_value_change);
 	}
 	~ContentBase () {
 		debug ("Destroying ContentBase");
 	}
 
+	protected virtual void on_scrolled_vadjustment_value_change () {
+		if (
+			!bottom_reached_locked
+			&& scrolled.vadjustment.value > scrolled.vadjustment.upper - scrolled.vadjustment.page_size * 2
+		) {
+			bottom_reached_locked = true;
+			on_bottom_reached ();
+		}
+
+		var is_close_to_top = scrolled.vadjustment.value <= 1000;
+		scroll_to_top_rev.reveal_child = !is_close_to_top
+			&& scrolled.vadjustment.value + scrolled.vadjustment.page_size + 100 < scrolled.vadjustment.upper;
+
+		if (is_close_to_top) reached_close_to_top ();
+	}
+
 	private void bind_listitem_cb (GLib.Object item) {
 		((Gtk.ListItem) item).child = on_create_model_widget (((Gtk.ListItem) item).item);
 	}
diff --git a/src/Views/Home.vala b/src/Views/Home.vala
index 0406fc715..64f8224d8 100644
--- a/src/Views/Home.vala
+++ b/src/Views/Home.vala
@@ -1,8 +1,41 @@
 public class Tuba.Views.Home : Views.Timeline {
+    Gtk.Revealer compose_button_rev;
     construct {
         url = "/api/v1/timelines/home";
         label = _("Home");
         icon = "tuba-home-symbolic";
+
+        scroll_to_top_rev.margin_end = 32;
+        scroll_to_top_rev.margin_bottom = 80;
+
+        compose_button_rev = new Gtk.Revealer () {
+            transition_type = Gtk.RevealerTransitionType.SLIDE_UP,
+            valign = halign = Gtk.Align.END,
+            margin_end = margin_bottom = 24,
+            reveal_child = true,
+            child = new Gtk.Button.from_icon_name ("document-edit-symbolic") {
+                action_name = "app.compose",
+                tooltip_text = _("Compose"),
+                css_classes = { "circular", "compose-button", "suggested-action" }
+            }
+        };
+
+		compose_button_rev.bind_property ("reveal-child", scroll_to_top_rev, "margin-bottom", GLib.BindingFlags.SYNC_CREATE, (b, src, ref target) => {
+			target.set_int (src.get_boolean () ? 80 : 24);
+
+			return true;
+		});
+
+        scrolled_overlay.add_overlay (compose_button_rev);
+    }
+
+    double last_adjustment = 0.0;
+    protected override void on_scrolled_vadjustment_value_change () {
+        base.on_scrolled_vadjustment_value_change ();
+
+        if (scrolled.vadjustment.value > 1000)
+            compose_button_rev.reveal_child = scrolled.vadjustment.value + scrolled.vadjustment.page_size + 100 < scrolled.vadjustment.upper;
+        last_adjustment = scrolled.vadjustment.value;
     }
 
     public override string? get_stream_url () {