diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index b28c79ac54..fccf1e3524 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -56,7 +56,7 @@ export default class RoomProvider extends AutocompleteProvider {
         const {command, range} = this.getCurrentCommand(query, selection, force);
         if (command) {
             // the only reason we need to do this is because Fuse only matches on properties
-            let matcherObjects = client.getRooms().filter(
+            let matcherObjects = client.getVisibleRooms().filter(
                 (room) => !!room && !!getDisplayAliasForRoom(room),
             ).map((room) => {
                 return {
diff --git a/src/editor/parts.js b/src/editor/parts.js
index 137018d7e9..cb801740d4 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -426,7 +426,7 @@ export class PartCreator {
         let room;
         if (alias[0] === '#') {
             room = this._client.getRooms().find((r) => {
-                return r.getAliases().includes(alias);
+                return r.getAliases().includes(alias) || r.getCanonicalAlias() === alias;
             });
         } else {
             room = this._client.getRoom(alias);