diff --git a/server/handlers.go b/server/handlers.go
index d6b43ad..505539d 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -81,6 +81,7 @@ func FolderListHandler(rw http.ResponseWriter, req *http.Request) {
 
 type UpdateFolder struct {
 	Title *string `json:"title,omitempty"`
+	IsExpanded *bool `json:"is_expanded,omitempty"`
 }
 
 func FolderHandler(rw http.ResponseWriter, req *http.Request) {
@@ -99,6 +100,9 @@ func FolderHandler(rw http.ResponseWriter, req *http.Request) {
 		if body.Title != nil {
 			db(req).RenameFolder(id, *body.Title)
 		}
+		if body.IsExpanded != nil {
+			db(req).ToggleFolderExpanded(id, *body.IsExpanded)
+		}
 		rw.WriteHeader(http.StatusOK)
 	} else if req.Method == "DELETE" {
 		db(req).DeleteFolder(id)
diff --git a/storage/settings.go b/storage/settings.go
index 700b605..fccb7b2 100644
--- a/storage/settings.go
+++ b/storage/settings.go
@@ -5,6 +5,7 @@ import "encoding/json"
 func settingsDefaults() map[string]interface{} {
 	return map[string]interface{}{
 		"filter": "",
+		"feed": "",
 		"feed_list_width": 300,
 		"item_list_width": 300,
 	}
diff --git a/template/index.html b/template/index.html
index c4bfe76..682113f 100644
--- a/template/index.html
+++ b/template/index.html
@@ -38,7 +38,7 @@
                     </label>
                 </div>
                 <label class="nav-select">
-                    <input type="radio" name="feed" :value="null" v-model="feedSelected">
+                    <input type="radio" name="feed" value="" v-model="feedSelected">
                     <div class="menu-item d-flex align-items-center w-100">
                         <img src="./static/images/layers.svg" alt="" class="nav-icon">
                         <span class="flex-fill text-left text-truncate">All Feeds</span>
diff --git a/template/static/javascripts/app.js b/template/static/javascripts/app.js
index 7e5c222..824958a 100644
--- a/template/static/javascripts/app.js
+++ b/template/static/javascripts/app.js
@@ -57,6 +57,7 @@ var vm = new Vue({
   created: function() {
     var vm = this
     api.settings.get().then(function(data) {
+      vm.feedSelected = data.feed
       vm.filterSelected = data.filter
       vm.refreshItems()
     })
@@ -140,13 +141,11 @@ var vm = new Vue({
   watch: {
     'filterSelected': function(newVal, oldVal) {
       if (oldVal === null) return  // do nothing, initial setup
-      var vm = this
-      api.settings.update({filter: newVal}).then(function() {
-        vm.refreshItems()
-      })
+      api.settings.update({filter: newVal}).then(this.refreshItems.bind(this))
     },
     'feedSelected': function(newVal, oldVal) {
-      this.refreshItems()
+      if (oldVal === null) return  // do nothing, initial setup
+      api.settings.update({feed: newVal}).then(this.refreshItems.bind(this))
     },
     'itemSelected': function(newVal, oldVal) {
       this.itemSelectedReadability = ''
@@ -237,6 +236,7 @@ var vm = new Vue({
     },
     toggleFolderExpanded: function(folder) {
       folder.is_expanded = !folder.is_expanded
+      api.folders.update(folder.id, {is_expanded: folder.is_expanded})
     },
     formatDate: function(datestr) {
       var options = {