diff --git a/app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt b/app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt
index 1f045aed6..aea649a25 100644
--- a/app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt
@@ -22,6 +22,7 @@ import android.view.MenuItem
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.commit
 import androidx.lifecycle.Lifecycle
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.keylesspalace.tusky.appstore.EventHub
 
 import com.keylesspalace.tusky.fragment.TimelineFragment
@@ -74,12 +75,14 @@ class StatusListActivity : BottomSheetActivity(), HasAndroidInjector {
         }
 
         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`(AutoDispose.autoDisposable(AndroidLifecycleScopeProvider.from(this, Lifecycle.Event.ON_DESTROY)))
                 .subscribe(quickTootHelper::handleEvent)
+        composeButton.setOnClickListener { quickTootHelper.composeButton() }
 
     }
 
diff --git a/app/src/main/res/layout/activity_statuslist.xml b/app/src/main/res/layout/activity_statuslist.xml
index 75aa4b7b0..cf5d13ce4 100644
--- a/app/src/main/res/layout/activity_statuslist.xml
+++ b/app/src/main/res/layout/activity_statuslist.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/fragment_container"
+            app:layout_anchorGravity="bottom|end"
+            app:srcCompat="@drawable/ic_create_24dp" />
+
         <include layout="@layout/item_status_bottom_sheet" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>