diff --git a/app/src/main/java/com/keylesspalace/tusky/ModalTimelineActivity.kt b/app/src/main/java/com/keylesspalace/tusky/ModalTimelineActivity.kt
index e44f2ddbc..8077d628d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ModalTimelineActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/ModalTimelineActivity.kt
@@ -63,12 +63,14 @@ class ModalTimelineActivity : BottomSheetActivity(), ActionButtonActivity, HasAn
         }
 
         val quickTootContainer = findViewById<ConstraintLayout>(R.id.quick_toot_container)
+        val composeButton = findViewById<FloatingActionButton>(R.id.floating_btn)
         val quickTootHelper = QuickTootHelper(quickTootContainer, accountManager, eventHub)
 
         eventHub.events
                 .observeOn(AndroidSchedulers.mainThread())
                 .`as`(autoDisposable(from(this, Lifecycle.Event.ON_DESTROY)))
                 .subscribe(quickTootHelper::handleEvent)
+        composeButton.setOnClickListener { quickTootHelper.composeButton() }
     }
 
     override fun getActionButton(): FloatingActionButton? = null
diff --git a/app/src/main/res/layout/activity_modal_timeline.xml b/app/src/main/res/layout/activity_modal_timeline.xml
index 41c2a31c4..1687467d8 100644
--- a/app/src/main/res/layout/activity_modal_timeline.xml
+++ b/app/src/main/res/layout/activity_modal_timeline.xml
@@ -21,6 +21,16 @@
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/floating_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:contentDescription="@string/action_compose"
+            app:layout_anchor="@id/contentFrame"
+            app:layout_anchorGravity="bottom|end"
+            app:srcCompat="@drawable/ic_create_24dp" />
+
         <include layout="@layout/item_status_bottom_sheet" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>