diff --git a/src/App.js b/src/App.js
index f5bd7e2e4..12a12f71e 100644
--- a/src/App.js
+++ b/src/App.js
@@ -85,8 +85,12 @@ export default {
     isChats () {
       return this.$route.name === 'chat' || this.$route.name === 'chats'
     },
+    isListEdit () {
+      return this.$route.name === 'lists-edit'
+    },
     newPostButtonShown () {
       if (this.isChats) return false
+      if (this.isListEdit) return false
       return this.$store.getters.mergedConfig.alwaysShowNewPostButton || this.layoutType === 'mobile'
     },
     showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
diff --git a/src/App.vue b/src/App.vue
index c741aa700..cb6a0115f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,7 +33,7 @@
       <div
         id="main-scroller"
         class="column main"
-        :class="{ '-full-height': isChats }"
+        :class="{ '-full-height': isChats || isListEdit }"
       >
         <div
           v-if="!currentUser"
diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js
index e4d0c22ad..b1516af04 100644
--- a/src/components/lists_edit/lists_edit.js
+++ b/src/components/lists_edit/lists_edit.js
@@ -1,7 +1,9 @@
 import { mapState, mapGetters } from 'vuex'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import ListsUserSearch from '../lists_user_search/lists_user_search.vue'
+import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faSearch,
@@ -17,22 +19,32 @@ const ListsNew = {
   components: {
     BasicUserCard,
     UserAvatar,
-    ListsUserSearch
+    ListsUserSearch,
+    TabSwitcher,
+    PanelLoading
   },
   data () {
     return {
       title: '',
-      userIds: [],
-      selectedUserIds: []
+      titleDraft: '',
+      membersUserIds: [],
+      removedUserIds: new Set([]), // users we added for members, to undo
+      searchUserIds: [],
+      addedUserIds: new Set([]), // users we added from search, to undo
+      searchLoading: false,
+      reallyDelete: false
     }
   },
   created () {
     this.$store.dispatch('fetchList', { listId: this.id })
-      .then(() => { this.title = this.findListTitle(this.id) })
+      .then(() => {
+        this.title = this.findListTitle(this.id)
+        this.titleDraft = this.title
+      })
     this.$store.dispatch('fetchListAccounts', { listId: this.id })
       .then(() => {
-        this.selectedUserIds = this.findListAccounts(this.id)
-        this.selectedUserIds.forEach(userId => {
+        this.membersUserIds = this.findListAccounts(this.id)
+        this.membersUserIds.forEach(userId => {
           this.$store.dispatch('fetchUserIfMissing', userId)
         })
       })
@@ -41,11 +53,12 @@ const ListsNew = {
     id () {
       return this.$route.params.id
     },
-    users () {
-      return this.userIds.map(userId => this.findUser(userId))
+    membersUsers () {
+      return [...this.membersUserIds, ...this.addedUserIds]
+        .map(userId => this.findUser(userId)).filter(user => user)
     },
-    selectedUsers () {
-      return this.selectedUserIds.map(userId => this.findUser(userId)).filter(user => user)
+    searchUsers () {
+      return this.searchUserIds.map(userId => this.findUser(userId)).filter(user => user)
     },
     ...mapState({
       currentUser: state => state.users.currentUser
@@ -56,30 +69,51 @@ const ListsNew = {
     onInput () {
       this.search(this.query)
     },
-    selectUser (user) {
-      if (this.selectedUserIds.includes(user.id)) {
-        this.removeUser(user.id)
-      } else {
+    toggleRemoveMember (user) {
+      if (this.removedUserIds.has(user.id)) {
         this.addUser(user)
+        this.removedUserIds.delete(user.id)
+      } else {
+        this.removeUser(user.id)
+        this.removedUserIds.add(user.id)
       }
     },
-    isSelected (user) {
-      return this.selectedUserIds.includes(user.id)
+    toggleAddFromSearch (user) {
+      if (this.addedUserIds.has(user.id)) {
+        this.removeUser(user.id)
+        this.addedUserIds.delete(user.id)
+      } else {
+        this.addUser(user)
+        this.addedUserIds.add(user.id)
+      }
+    },
+    isRemoved (user) {
+      return this.removedUserIds.has(user.id)
+    },
+    isAdded (user) {
+      return this.addedUserIds.has(user.id)
     },
     addUser (user) {
-      this.selectedUserIds.push(user.id)
+      // this.selectedUserIds.push(user.id)
     },
     removeUser (userId) {
-      this.selectedUserIds = this.selectedUserIds.filter(id => id !== userId)
+      // this.selectedUserIds = this.selectedUserIds.filter(id => id !== userId)
     },
-    onResults (results) {
-      this.userIds = results
+    onSearchLoading (results) {
+      this.searchLoading = true
     },
-    updateList () {
-      this.$store.dispatch('setList', { listId: this.id, title: this.title })
-      this.$store.dispatch('setListAccounts', { listId: this.id, accountIds: this.selectedUserIds })
-
-      this.$router.push({ name: 'lists-timeline', params: { id: this.id } })
+    onSearchLoadingDone (results) {
+      this.searchLoading = false
+    },
+    onSearchResults (results) {
+      this.searchLoading = false
+      this.searchUserIds = results
+    },
+    updateListTitle () {
+      this.$store.dispatch('setList', { listId: this.id, title: this.titleDraft })
+        .then(() => {
+          this.title = this.findListTitle(this.id)
+        })
     },
     deleteList () {
       this.$store.dispatch('deleteList', { listId: this.id })
diff --git a/src/components/lists_edit/lists_edit.vue b/src/components/lists_edit/lists_edit.vue
index 69007b022..e788c00ae 100644
--- a/src/components/lists_edit/lists_edit.vue
+++ b/src/components/lists_edit/lists_edit.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="panel-default panel list-edit">
+  <div class="panel-default panel ListEdit">
     <div
       ref="header"
-      class="panel-heading"
+      class="panel-heading list-edit-heading"
     >
       <button
         class="button-unstyled go-back-button"
@@ -13,54 +13,137 @@
           icon="chevron-left"
         />
       </button>
-    </div>
-    <div class="input-wrap">
-      <input
-        ref="title"
-        v-model="title"
-        :placeholder="$t('lists.title')"
-      >
-    </div>
-    <div class="member-list">
-      <div
-        v-for="user in selectedUsers"
-        :key="user.id"
-        class="member"
-      >
-        <BasicUserCard
-          :user="user"
-          :class="isSelected(user) ? 'selected' : ''"
-          @click.capture.prevent="selectUser(user)"
-        />
+      <div class="title">
+        <i18n-t
+          keypath="lists.editing_list"
+        >
+          <template #listTitle>
+            {{ title }}
+          </template>
+        </i18n-t>
       </div>
     </div>
-    <ListsUserSearch @results="onResults" />
-    <div class="member-list">
-      <div
-        v-for="user in users"
-        :key="user.id"
-        class="member"
-      >
-        <BasicUserCard
-          :user="user"
-          :class="isSelected(user) ? 'selected' : ''"
-          @click.capture.prevent="selectUser(user)"
-        />
+    <div class="panel-body">
+      <div class="input-wrap">
+        <label for="list-edit-title">{{ $t('lists.title') }}</label>
+        {{ ' ' }}
+        <input
+          id="list-edit-title"
+          ref="title"
+          v-model="titleDraft"
+        >
+        <button
+          class="btn button-default follow-button"
+          @click="updateListTitle"
+        >
+          {{ $t('lists.update_title') }}
+        </button>
       </div>
+      <tab-switcher
+        class="list-member-management"
+        :scrollable-tabs="true"
+      >
+        <div
+          :label="$t('lists.manage_members')"
+          class="members-list"
+        >
+          <div class="users-list">
+            <div
+              v-for="user in membersUsers"
+              :key="user.id"
+              class="member"
+            >
+              <BasicUserCard
+                :user="user"
+              >
+                <button
+                  class="btn button-default follow-button"
+                  @click="toggleRemoveMember(user)"
+                >
+                  {{ isRemoved(user) ? $t('general.undo') : $t('lists.remove_from_list') }}
+                </button>
+              </BasicUserCard>
+            </div>
+          </div>
+        </div>
+
+        <div
+          class="search-list"
+          :label="$t('lists.add_members')"
+        >
+          <ListsUserSearch
+            @results="onSearchResults"
+            @loading="onSearchLoading"
+            @loadingDone="onSearchLoadingDone"
+          />
+          <div
+            v-if="searchLoading"
+            class="loading"
+          >
+            <PanelLoading />
+          </div>
+          <div
+            v-else
+            class="users-list"
+          >
+            <div
+              v-for="user in searchUsers"
+              :key="user.id"
+              class="member"
+            >
+              <BasicUserCard
+                :user="user"
+              >
+                <span
+                  v-if="membersUserIds.includes(user.id)"
+                >
+                  {{ $t('lists.is_in_list') }}
+                </span>
+                <button
+                  v-if="!membersUserIds.includes(user.id)"
+                  class="btn button-default follow-button"
+                  @click="toggleAddFromSearch(user)"
+                >
+                  {{ isAdded(user) ? $t('general.undo') : $t('lists.add_to_list') }}
+                </button>
+                <button
+                  v-else
+                  class="btn button-default follow-button"
+                  @click="toggleRemoveMember(user)"
+                >
+                  {{ isRemoved(user) ? $t('general.undo') : $t('lists.remove_from_list') }}
+                </button>
+              </BasicUserCard>
+            </div>
+          </div>
+        </div>
+      </tab-switcher>
+    </div>
+    <div class="panel-footer">
+      <span class="spacer" />
+      <button
+        v-if="!reallyDelete"
+        class="btn button-default delete-button"
+        @click="reallyDelete = true"
+      >
+        {{ $t('lists.delete') }}
+      </button>
+      <template v-else>
+        {{ $t('lists.really_delete') }}
+        <button
+          class="btn button-default delete-button"
+          @click="deleteList"
+        >
+          {{ $t('general.yes') }}
+        </button>
+        <button
+          class="btn button-default delete-button"
+          @click="reallyDelete = false"
+        >
+          {{ $t('general.no') }}
+        </button>
+      </template>
     </div>
-    <button
-      :disabled="title && title.length === 0"
-      class="btn button-default"
-      @click="updateList"
-    >
-      {{ $t('lists.save') }}
-    </button>
-    <button
-      class="btn button-default"
-      @click="deleteList"
-    >
-      {{ $t('lists.delete') }}
-    </button>
   </div>
 </template>
 
@@ -69,28 +152,43 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.list-edit {
-  .input-wrap {
-    display: flex;
-    margin: 0.7em 0.5em 0.7em 0.5em;
+.ListEdit {
+  --panel-body-padding: 0.5em;
 
-    input {
-      width: 100%;
-    }
+  height: calc(100vh - var(--navbar-height));
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+
+  .list-edit-heading {
+    grid-template-columns: auto minmax(50%, 1fr);
+  }
+
+  .panel-body {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow: hidden;
+  }
+
+  .list-member-management {
+    flex: 1 0 auto;
   }
 
   .search-icon {
     margin-right: 0.3em;
   }
 
-  .member-list {
+  .users-list {
     padding-bottom: 0.7rem;
+    overflow-y: auto;
   }
 
-  .basic-user-card:hover,
-  .basic-user-card.selected {
-    cursor: pointer;
-    background-color: var(--selectedPost, $fallback--lightBg);
+  & .search-list,
+  & .members-list {
+    overflow: hidden;
+    flex-direction: column;
+    min-height: 0;
   }
 
   .go-back-button {
@@ -102,7 +200,15 @@
   }
 
   .btn {
-    margin: 0.5em;
+    margin: 0 0.5em;
+  }
+
+  .panel-footer {
+    grid-template-columns: minmax(10%, 1fr);
+
+    .delete-button {
+      min-width: 9em;
+    }
   }
 }
 </style>
diff --git a/src/components/lists_user_search/lists_user_search.js b/src/components/lists_user_search/lists_user_search.js
index 5798841a9..c92ec0eee 100644
--- a/src/components/lists_user_search/lists_user_search.js
+++ b/src/components/lists_user_search/lists_user_search.js
@@ -15,6 +15,7 @@ const ListsUserSearch = {
   components: {
     Checkbox
   },
+  emits: ['loading', 'loadingDone', 'results'],
   data () {
     return {
       loading: false,
@@ -33,12 +34,16 @@ const ListsUserSearch = {
       }
 
       this.loading = true
+      this.$emit('loading')
       this.userIds = []
       this.$store.dispatch('search', { q: query, resolve: true, type: 'accounts', following: this.followingOnly })
         .then(data => {
-          this.loading = false
           this.$emit('results', data.accounts.map(a => a.id))
         })
+        .finally(() => {
+          this.loading = false
+          this.$emit('loadingDone')
+        })
     }
   }
 }
diff --git a/src/components/lists_user_search/lists_user_search.vue b/src/components/lists_user_search/lists_user_search.vue
index 03fb3ba65..8633170c6 100644
--- a/src/components/lists_user_search/lists_user_search.vue
+++ b/src/components/lists_user_search/lists_user_search.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="ListsUserSearch">
     <div class="input-wrap">
       <div class="input-search">
         <FAIcon
@@ -29,17 +29,19 @@
 <style lang="scss">
 @import '../../_variables.scss';
 
-.input-wrap {
-  display: flex;
-  margin: 0.7em 0.5em 0.7em 0.5em;
+.ListsUserSearch {
+  .input-wrap {
+    display: flex;
+    margin: 0.7em 0.5em 0.7em 0.5em;
 
-  input {
-    width: 100%;
+    input {
+      width: 100%;
+    }
+  }
+
+  .search-icon {
+    margin-right: 0.3em;
   }
 }
 
-.search-icon {
-  margin-right: 0.3em;
-}
-
 </style>
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js
index ecf79b645..f7f96cd67 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.js
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.js
@@ -10,7 +10,8 @@ library.add(
 
 const HIDDEN_FOR_PAGES = new Set([
   'chats',
-  'chat'
+  'chat',
+  'lists-edit'
 ])
 
 const MobilePostStatusButton = {
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index 7a086b260..d930368c0 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -17,6 +17,7 @@
       overflow-x: auto;
       padding-top: 5px;
       flex-direction: row;
+      flex: 0 0 auto;
 
       &::after, &::before {
         content: '';
diff --git a/src/components/user_list_menu/user_list_menu.vue b/src/components/user_list_menu/user_list_menu.vue
index f90c5f87f..d8da16ea5 100644
--- a/src/components/user_list_menu/user_list_menu.vue
+++ b/src/components/user_list_menu/user_list_menu.vue
@@ -7,18 +7,18 @@
     >
       <template #content>
         <div class="dropdown-menu">
-            <button
-              v-for="list in lists"
-              :key="list.id"
-              class="button-default dropdown-item"
-              @click="toggleList(list.id)"
-            >
-              <span
-                class="menu-checkbox"
-                :class="{ 'menu-checkbox-checked': list.inList }"
-              />
-              {{ list.title }}
-            </button>
+          <button
+            v-for="list in lists"
+            :key="list.id"
+            class="button-default dropdown-item"
+            @click="toggleList(list.id)"
+          >
+            <span
+              class="menu-checkbox"
+              :class="{ 'menu-checkbox-checked': list.inList }"
+            />
+            {{ list.title }}
+          </button>
         </div>
       </template>
       <template #trigger>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 7352b75c8..733bd7ac9 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -80,6 +80,9 @@
     "confirm": "Confirm",
     "verify": "Verify",
     "close": "Close",
+    "undo": "Undo",
+    "yes": "Yes",
+    "no": "No",
     "peek": "Peek",
     "role": {
       "admin": "Admin",
@@ -981,7 +984,15 @@
     "save": "Save changes",
     "delete": "Delete list",
     "following_only": "Limit to Following",
-    "manage_lists": "Manage lists"
+    "manage_lists": "Manage lists",
+    "manage_members": "Manage list members",
+    "add_members": "Search for more users",
+    "remove_from_list": "Remove from list",
+    "add_to_list": "Add to list",
+    "is_in_list": "Already in list",
+    "editing_list": "Editing list {listTitle}",
+    "update_title": "Save Title",
+    "really_delete": "Really delete list?"
   },
   "file_type": {
     "audio": "Audio",
diff --git a/src/modules/lists.js b/src/modules/lists.js
index d9fab9695..22fed8005 100644
--- a/src/modules/lists.js
+++ b/src/modules/lists.js
@@ -15,10 +15,11 @@ export const mutations = {
     }
     state.allListsObject[listId].title = title
 
-    if (!find(state.allLists, { id: listId })) {
+    const entry = find(state.allLists, { id: listId })
+    if (!entry) {
       state.allLists.push({ id: listId, title })
     } else {
-      find(state.allLists, { id: listId }).title = title
+      entry.title = title
     }
   },
   setListAccounts (state, { listId, accountIds }) {
diff --git a/src/modules/serverSideStorage.js b/src/modules/serverSideStorage.js
index 08b11b0ba..56164be7a 100644
--- a/src/modules/serverSideStorage.js
+++ b/src/modules/serverSideStorage.js
@@ -132,7 +132,15 @@ export const _mergeFlags = (recent, stale, allFlagKeys) => {
 }
 
 const _mergeJournal = (...journals) => {
-  const allJournals = flatten(journals.map(j => Array.isArray(j) ? j : []))
+  // Ignore invalid journal entries
+  const allJournals = flatten(
+    journals.map(j => Array.isArray(j) ? j : [])
+  ).filter(entry =>
+    Object.prototype.hasOwnProperty.call(entry, 'path') &&
+    Object.prototype.hasOwnProperty.call(entry, 'operation') &&
+    Object.prototype.hasOwnProperty.call(entry, 'args') &&
+    Object.prototype.hasOwnProperty.call(entry, 'timestamp')
+  )
   const grouped = groupBy(allJournals, 'path')
   const trimmedGrouped = Object.entries(grouped).map(([path, journal]) => {
     // side effect
diff --git a/test/unit/specs/modules/lists.spec.js b/test/unit/specs/modules/lists.spec.js
index ac9af1b6b..e43106eac 100644
--- a/test/unit/specs/modules/lists.spec.js
+++ b/test/unit/specs/modules/lists.spec.js
@@ -17,13 +17,13 @@ describe('The lists module', () => {
       const list = { id: '1', title: 'testList' }
       const modList = { id: '1', title: 'anotherTestTitle' }
 
-      mutations.setList(state, list)
-      expect(state.allListsObject[list.id]).to.eql({ title: list.title })
+      mutations.setList(state, { listId: list.id, title: list.title })
+      expect(state.allListsObject[list.id]).to.eql({ title: list.title, accountIds: [] })
       expect(state.allLists).to.have.length(1)
       expect(state.allLists[0]).to.eql(list)
 
-      mutations.setList(state, modList)
-      expect(state.allListsObject[modList.id]).to.eql({ title: modList.title })
+      mutations.setList(state, { listId: modList.id, title: modList.title })
+      expect(state.allListsObject[modList.id]).to.eql({ title: modList.title, accountIds: [] })
       expect(state.allLists).to.have.length(1)
       expect(state.allLists[0]).to.eql(modList)
     })
@@ -33,10 +33,10 @@ describe('The lists module', () => {
       const list = { id: '1', accountIds: ['1', '2', '3'] }
       const modList = { id: '1', accountIds: ['3', '4', '5'] }
 
-      mutations.setListAccounts(state, list)
+      mutations.setListAccounts(state, { listId: list.id, accountIds: list.accountIds })
       expect(state.allListsObject[list.id]).to.eql({ accountIds: list.accountIds })
 
-      mutations.setListAccounts(state, modList)
+      mutations.setListAccounts(state, { listId: modList.id, accountIds: modList.accountIds })
       expect(state.allListsObject[modList.id]).to.eql({ accountIds: modList.accountIds })
     })
 
@@ -47,9 +47,9 @@ describe('The lists module', () => {
           1: { title: 'testList', accountIds: ['1', '2', '3'] }
         }
       }
-      const id = '1'
+      const listId = '1'
 
-      mutations.deleteList(state, { id })
+      mutations.deleteList(state, { listId })
       expect(state.allLists).to.have.length(0)
       expect(state.allListsObject).to.eql({})
     })
diff --git a/test/unit/specs/modules/serverSideStorage.spec.js b/test/unit/specs/modules/serverSideStorage.spec.js
index 7adce20d4..be249eede 100644
--- a/test/unit/specs/modules/serverSideStorage.spec.js
+++ b/test/unit/specs/modules/serverSideStorage.spec.js
@@ -107,7 +107,7 @@ describe('The serverSideStorage module', () => {
       })
     })
     describe('setPreference', () => {
-      const { setPreference, updateCache, addToCollection, removeFromCollection } = mutations
+      const { setPreference, updateCache, addCollectionPreference, removeCollectionPreference } = mutations
 
       it('should set preference and update journal log accordingly', () => {
         const state = cloneDeep(defaultState)
@@ -127,12 +127,12 @@ describe('The serverSideStorage module', () => {
         const state = cloneDeep(defaultState)
         setPreference(state, { path: 'simple.testing', value: 1 })
         setPreference(state, { path: 'simple.testing', value: 2 })
-        addToCollection(state, { path: 'collections.testing', value: 2 })
-        removeFromCollection(state, { path: 'collections.testing', value: 2 })
+        addCollectionPreference(state, { path: 'collections.testing', value: 2 })
+        removeCollectionPreference(state, { path: 'collections.testing', value: 2 })
         updateCache(state, { username: 'test' })
         expect(state.prefsStorage.simple.testing).to.eql(2)
         expect(state.prefsStorage.collections.testing).to.eql([])
-        expect(state.prefsStorage._journal.length).to.eql(1)
+        expect(state.prefsStorage._journal.length).to.eql(2)
         expect(state.prefsStorage._journal[0]).to.eql({
           path: 'simple.testing',
           operation: 'set',
@@ -141,14 +141,13 @@ describe('The serverSideStorage module', () => {
           timestamp: state.prefsStorage._journal[0].timestamp
         })
         expect(state.prefsStorage._journal[1]).to.eql({
-          path: 'collection.testing',
-          operation: 'remove',
+          path: 'collections.testing',
+          operation: 'removeFromCollection',
           args: [2],
           // should have A timestamp, we don't really care what it is
           timestamp: state.prefsStorage._journal[1].timestamp
         })
       })
-      })
     })
   })