diff --git a/apps/wiki.json b/apps/wiki.json
index e46fc1af..11a3dee8 100644
--- a/apps/wiki.json
+++ b/apps/wiki.json
@@ -1,5 +1,5 @@
 {
   "type": "tildefriends-app",
   "emoji": "📝",
-  "previous": "&KrBCh2/8NVdDwJrOK0JB/Tszo/lAtjRI4XVdjZ2XNK8=.sha256"
+  "previous": "&OpEjJ6ZLsIabI1SOzLymRGKlwy2Q6YUI+I3JW5cR7nA=.sha256"
 }
\ No newline at end of file
diff --git a/apps/wiki/app.js b/apps/wiki/app.js
index b3663c96..c07c2a1b 100644
--- a/apps/wiki/app.js
+++ b/apps/wiki/app.js
@@ -56,11 +56,13 @@ function new_message() {
 }
 
 ssb.addEventListener('message', function(id) {
-	let resolve = g_new_message_resolve();
+	let resolve = g_new_message_resolve;
 	g_new_message_promise = new Promise(function(resolve, reject) {
 		g_new_message_resolve = resolve;
 	});
-	resolve();
+	if (resolve) {
+		resolve();
+	}
 });
 
 core.register('message', async function message_handler(message) {
diff --git a/apps/wiki/tf-collection.js b/apps/wiki/tf-collection.js
index b08361f7..82161442 100644
--- a/apps/wiki/tf-collection.js
+++ b/apps/wiki/tf-collection.js
@@ -65,17 +65,19 @@ class TfCollectionElement extends LitElement {
 		let self = this;
 		return html`
 			<span style="display: inline-flex; flex-direction: row">
-				<select @change=${this.on_selected} id="select">
-					<option value="">(select)</option>
-					${Object.values(this.collection ?? {}).map(x => html`<option value=${x.id} ?selected=${this.selected_id == x.id}>${x.name}</option>`)}
+				<select @change=${this.on_selected} id="select" value=${this.selected_id}>
+					<option value="" ?selected=${this.selected_id === ''} disabled hidden>(select)</option>
+					${Object.values(this.collection ?? {}).map(x => html`<option value=${x.id} ?selected=${this.selected_id === x.id}>${x.name}</option>`)}
 				</select>
 				<span ?hidden=${!this.is_renaming}>
-					<label for="rename_name">Rename to:</label>
-					<input type="text" id="rename_name"></input>
-					<button @click=${this.on_rename}>Rename ${this.type}</button>
-					<button @click=${() => self.is_renaming = false}>x</button>
+					<span style="display: inline-flex; flex-direction: row; margin-left: 8px; margin-right: 8px">
+						<label for="rename_name">🏷Rename to:</label>
+						<input type="text" id="rename_name"></input>
+						<button @click=${this.on_rename}>Rename ${this.type}</button>
+						<button @click=${() => self.is_renaming = false}>x</button>
+					</span>
 				</span>
-				<button @click=${() => self.is_renaming = true} ?disabled=${this.is_renaming || !this.selected_id}>✏️</button>
+				<button @click=${() => self.is_renaming = true} ?disabled=${this.is_renaming || !this.selected_id}>🏷</button>
 				<button @click=${self.on_tombstone} ?disabled=${!this.selected_id}>🪦</button>
 				<span ?hidden=${!this.is_creating}>
 					<label for="create_name">New ${this.type} name:</label>
diff --git a/apps/wiki/tf-collections-app.js b/apps/wiki/tf-collections-app.js
index f23539b5..90f20ae0 100644
--- a/apps/wiki/tf-collections-app.js
+++ b/apps/wiki/tf-collections-app.js
@@ -91,9 +91,11 @@ class TfCollectionsAppElement extends LitElement {
 
 	update_wiki_doc() {
 		let want_wiki_doc = this.hash_wiki_doc();
+		console.log('looking for', want_wiki_doc);
 		for (let wiki_doc of Object.values(this.wiki_docs ?? {})) {
 			if (wiki_doc.name === want_wiki_doc) {
 				this.wiki_doc = wiki_doc;
+				console.log('setting', wiki_doc.name);
 			}
 		}
 	}
@@ -157,7 +159,7 @@ class TfCollectionsAppElement extends LitElement {
 					@change=${this.on_wiki_changed}></tf-collection>
 				<tf-collection
 					.collection=${this.wiki_docs}
-					selected_id=${this.wiki_doc?.id}
+					selected_id=${(this.wiki_doc && this.wiki_doc?.parent == this.wiki?.id) ? this.wiki_doc?.id : ''}
 					@change=${this.on_wiki_doc_changed}></tf-collection>
 			</div>
 			${this.wiki_doc && this.wiki_doc.parent === this.wiki?.id ? html`