diff --git a/frontend/src/common/api.js b/frontend/src/common/api.js
index 57dac613c..8a40dbbfb 100644
--- a/frontend/src/common/api.js
+++ b/frontend/src/common/api.js
@@ -25,6 +25,12 @@ Api.interceptors.request.use(function (config) {
 
 Api.interceptors.response.use(function (response) {
     Notify.ajaxEnd();
+
+    if(typeof response.data == "string") {
+        Notify.error("Request failed - invalid response");
+        console.warn("WARNING: Server returned HTML instead of JSON - API not implemented?")
+    }
+
     return response;
 }, function (error) {
     Notify.ajaxEnd();
diff --git a/frontend/src/component/p-photo-details.vue b/frontend/src/component/p-photo-details.vue
index 0e1257c2d..18dbaeb16 100644
--- a/frontend/src/component/p-photo-details.vue
+++ b/frontend/src/component/p-photo-details.vue
@@ -8,7 +8,7 @@
                 </div>
             </v-card-title>
         </v-card>
-        <v-layout row wrap>
+        <v-layout row wrap class="p-results">
             <v-flex
                     v-for="(photo, index) in photos"
                     :key="index"
diff --git a/frontend/src/component/p-photo-list.vue b/frontend/src/component/p-photo-list.vue
index 531f9a821..34cc1bbc5 100644
--- a/frontend/src/component/p-photo-list.vue
+++ b/frontend/src/component/p-photo-list.vue
@@ -3,7 +3,7 @@
             :headers="listColumns"
             :items="photos"
             hide-actions
-            class="elevation-0 p-photos p-photo-list"
+            class="elevation-0 p-photos p-photo-list p-results"
             disable-initial-sort
             item-key="ID"
             v-model="selected"
diff --git a/frontend/src/component/p-photo-mosaic.vue b/frontend/src/component/p-photo-mosaic.vue
index b26051275..e60ce660f 100644
--- a/frontend/src/component/p-photo-mosaic.vue
+++ b/frontend/src/component/p-photo-mosaic.vue
@@ -8,7 +8,7 @@
                 </div>
             </v-card-title>
         </v-card>
-        <v-layout row wrap>
+        <v-layout row wrap class="p-results">
             <v-flex
                     v-for="(photo, index) in photos"
                     :key="index"
diff --git a/frontend/src/component/p-photo-tiles.vue b/frontend/src/component/p-photo-tiles.vue
index f6268a395..b230d3962 100644
--- a/frontend/src/component/p-photo-tiles.vue
+++ b/frontend/src/component/p-photo-tiles.vue
@@ -8,7 +8,7 @@
                 </div>
             </v-card-title>
         </v-card>
-        <v-layout row wrap>
+        <v-layout row wrap class="p-results">
             <v-flex
                     v-for="(photo, index) in photos"
                     :key="index"
diff --git a/frontend/src/css/app.css b/frontend/src/css/app.css
index d454bd79f..d66f09ca1 100644
--- a/frontend/src/css/app.css
+++ b/frontend/src/css/app.css
@@ -47,6 +47,15 @@ main {
     color: #00B8D4;
 }
 
+#photoprism main .p-results a {
+    color: #333333;
+}
+
+#photoprism main .p-inline-edit a {
+    color: #333333;
+    cursor: text;
+}
+
 #photoprism main a.v-tabs__item {
     color: #546E7A;
 }
diff --git a/frontend/src/pages/albums.vue b/frontend/src/pages/albums.vue
index 17904c332..8ce1dbdb9 100644
--- a/frontend/src/pages/albums.vue
+++ b/frontend/src/pages/albums.vue
@@ -36,7 +36,7 @@
                         </div>
                     </v-card-title>
                 </v-card>
-                <v-layout row wrap>
+                <v-layout row wrap class="p-results">
                     <v-flex
                             v-for="(album, index) in results"
                             :key="index"
@@ -64,7 +64,31 @@
                                 </v-img>
 
                                 <v-card-actions>
-                                    {{ album.AlbumName | capitalize }}
+                                    <v-edit-dialog
+                                            :return-value.sync="album.AlbumName"
+                                            lazy
+                                            @save="onSave(album)"
+                                            @cancel="onCancel"
+                                            @open="onDialogOpen"
+                                            @close="onDialogClose"
+                                            class="p-inline-edit"
+                                    >
+                                        {{ album.AlbumName | capitalize }}
+                                        <template v-slot:input>
+                                            <div class="mt-3 title">Change Title</div>
+                                        </template>
+                                        <template v-slot:input>
+                                            <v-text-field
+                                                    v-model="album.AlbumName"
+                                                    :rules="[titleRule]"
+                                                    label="Title"
+                                                    color="secondary-dark"
+                                                    single-line
+                                                    autofocus
+                                            ></v-text-field>
+                                        </template>
+                                    </v-edit-dialog>
+
                                     <v-spacer></v-spacer>
                                     <v-btn icon @click.stop.prevent="album.toggleLike()">
                                         <v-icon v-if="album.AlbumFavorite" color="#FFD600">star
@@ -116,6 +140,7 @@
                 filter: filter,
                 lastFilter: {},
                 routeName: routeName,
+                titleRule: v => v.length <= 25 || 'Title too long',
             };
         },
         methods: {
@@ -230,6 +255,19 @@
                     this.search();
                 })
             },
+            onSave (album) {
+                console.log('onSave', album);
+                album.update().then(() => this.$notify.success("All changes saved"));
+            },
+            onCancel () {
+                console.log('onCancel', arguments)
+            },
+            onDialogOpen () {
+                console.log('onDialogOpen', arguments)
+            },
+            onDialogClose () {
+                console.log('onDialogClose', arguments)
+            },
         },
         created() {
             this.search();
diff --git a/internal/api/albums.go b/internal/api/albums.go
index fa1cb18b2..e7a0dbdf7 100644
--- a/internal/api/albums.go
+++ b/internal/api/albums.go
@@ -41,7 +41,7 @@ func GetAlbums(router *gin.RouterGroup, conf *config.Config) {
 	})
 }
 
-type CreateAlbumParams struct {
+type AlbumParams struct {
 	AlbumName string `json:"AlbumName"`
 }
 
@@ -53,7 +53,7 @@ func CreateAlbum(router *gin.RouterGroup, conf *config.Config) {
 			return
 		}
 
-		var params CreateAlbumParams
+		var params AlbumParams
 
 		if err := c.BindJSON(&params); err != nil {
 			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": util.UcFirst(err.Error())})
@@ -72,6 +72,38 @@ func CreateAlbum(router *gin.RouterGroup, conf *config.Config) {
 	})
 }
 
+// PUT /api/v1/albums/:uuid
+func UpdateAlbum(router *gin.RouterGroup, conf *config.Config) {
+	router.PUT("/albums/:uuid", func(c *gin.Context) {
+		if Unauthorized(c, conf) {
+			c.AbortWithStatusJSON(http.StatusUnauthorized, ErrUnauthorized)
+			return
+		}
+
+		var params AlbumParams
+
+		if err := c.BindJSON(&params); err != nil {
+			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": util.UcFirst(err.Error())})
+			return
+		}
+
+		id := c.Param("uuid")
+		search := photoprism.NewSearch(conf.OriginalsPath(), conf.Db())
+
+		m, err := search.FindAlbumByUUID(id)
+
+		if err != nil {
+			c.AbortWithStatusJSON(404, gin.H{"error": util.UcFirst(err.Error())})
+			return
+		}
+
+		m.AlbumName = params.AlbumName
+		conf.Db().Save(&m)
+
+		c.JSON(http.StatusOK, m)
+	})
+}
+
 // POST /api/v1/albums/:uuid/like
 //
 // Parameters:
diff --git a/internal/server/routes.go b/internal/server/routes.go
index 8d42b9a6d..1b9be2bd2 100644
--- a/internal/server/routes.go
+++ b/internal/server/routes.go
@@ -46,6 +46,7 @@ func registerRoutes(router *gin.Engine, conf *config.Config) {
 		api.DislikeAlbum(v1, conf)
 		api.AlbumThumbnail(v1, conf)
 		api.CreateAlbum(v1, conf)
+		api.UpdateAlbum(v1, conf)
 
 		api.GetSettings(v1, conf)
 		api.SaveSettings(v1, conf)