diff --git a/plugins/nextcloud/js/message.js b/plugins/nextcloud/js/message.js
index 861e81d87..858a71a88 100644
--- a/plugins/nextcloud/js/message.js
+++ b/plugins/nextcloud/js/message.js
@@ -32,6 +32,8 @@
 								view.saveNextcloudLoading(false);
 								view.saveNextcloudError(true);
 							});
+						} else {
+							view.saveNextcloudLoading(false);
 						}
 					});
 				}
diff --git a/plugins/nextcloud/js/webdav.js b/plugins/nextcloud/js/webdav.js
index b4ab06a42..8b0dc39b5 100644
--- a/plugins/nextcloud/js/webdav.js
+++ b/plugins/nextcloud/js/webdav.js
@@ -153,7 +153,6 @@
 		constructor() {
 			super('NextcloudFiles');
 			this.addObservables({
-				folder: '',
 				files: false
 			});
 		}
@@ -164,8 +163,8 @@
 				if (event.target.matches('button')) {
 					let li = event.target.closest('li');
 					if (li.item_name) {
+						this.select = li.item_name;
 						this.close();
-						this.fResolve(li.item_name);
 					}
 				}
 			});
@@ -173,6 +172,7 @@
 
 		// Happens after showModal()
 		beforeShow(files, fResolve) {
+			this.select = '';
 			this.files(!!files);
 			this.fResolve = fResolve;
 
@@ -182,10 +182,8 @@
 			}).catch(err => console.error(err))
 		}
 
-		onClose() {
-			this.close();
-			this.fResolve();
-			return false;
+		onHide() {
+			this.fResolve(this.select);
 		}
 /*
 	onShow() {}     // Happens after  showModal()