diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index 643e988ca..c820a5d46 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -562,6 +562,9 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             if (popup.menu is MenuBuilder) {
                 val menuBuilder = popup.menu as MenuBuilder
 
+                if (tabs[i].id == LIST) {
+                    menuBuilder.findItem(R.id.tabEditList).isVisible = true
+                }
                 if (tabs[i].id in arrayOf(HOME, LOCAL, FEDERATED, LIST)) {
                     menuBuilder.findItem(R.id.tabToggleStreaming).apply {
                         isVisible = true
@@ -605,6 +608,12 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                             (fragment as ReselectableFragment).onReset()
                         }
                     }
+                    R.id.tabEditList -> {
+                        AccountsInListFragment.newInstance(
+                                tabs[i].arguments.getOrNull(0).orEmpty(),
+                                tabs[i].arguments.getOrNull(1).orEmpty()
+                        ).show(supportFragmentManager, null)
+                    }
                     R.id.tabToggleStreaming -> {
                         if (fragment is TimelineFragment) {
                             fragment.streamingEnabled = !fragment.streamingEnabled
diff --git a/app/src/main/res/menu/view_tab_action.xml b/app/src/main/res/menu/view_tab_action.xml
index 4385ad78c..cdbe535ea 100644
--- a/app/src/main/res/menu/view_tab_action.xml
+++ b/app/src/main/res/menu/view_tab_action.xml
@@ -9,6 +9,11 @@
         android:icon="@drawable/ic_reject_24dp"
         android:title="@string/action_tab_reset" />
 
+    <item android:id="@+id/tabEditList"
+        android:icon="@drawable/ic_list"
+        android:title="@string/action_tab_edit_list"
+        android:visible="false" />
+
     <item android:id="@+id/tabToggleStreaming"
         android:icon="@drawable/ic_check_24dp"
         android:title="@string/action_tab_toggle_streaming"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d3aa623b1..07d6a2de3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -148,6 +148,7 @@
     <string name="action_authorize">Authorize Now!</string>
     <string name="action_tab_jump_to_top">Jump to top</string>
     <string name="action_tab_reset">Reset tab</string>
+    <string name="action_tab_edit_list">Edit this list</string>
     <string name="action_tab_toggle_streaming">Use streaming in this tab</string>
     <string name="action_tab_toggle_notifications_filter">Toggle notifications filter</string>