diff --git a/src/usecases/accept-invite.js b/src/usecases/accept-invite.js
index 3676f6641b..bcecf41ed2 100644
--- a/src/usecases/accept-invite.js
+++ b/src/usecases/accept-invite.js
@@ -31,7 +31,7 @@ module.exports = async function acceptInvite(session, name) {
 
     await inviteHandle.click();
 
-    const acceptInvitationLink = await session.query(".mx_RoomPreviewBar_join_text a:first-child");
+    const acceptInvitationLink = await session.query(".mx_RoomPreviewBar_Invite .mx_AccessibleButton_kind_primary");
     await acceptInvitationLink.click();
 
     session.log.done();
diff --git a/src/usecases/join.js b/src/usecases/join.js
index cf23fbfb64..9bc7007849 100644
--- a/src/usecases/join.js
+++ b/src/usecases/join.js
@@ -26,7 +26,7 @@ module.exports = async function join(session, roomName) {
     const firstRoomLabel = await session.query('.mx_RoomDirectory_table .mx_RoomDirectory_name:first-child');
     await firstRoomLabel.click();
 
-    const joinLink = await session.query('.mx_RoomPreviewBar_join_text a');
+    const joinLink = await session.query('.mx_RoomPreviewBar_ViewingRoom .mx_AccessibleButton_kind_primary');
     await joinLink.click();
 
     await session.query('.mx_MessageComposer');