diff --git a/src/core.py b/src/core.py
index 1ef6a556..bf2a25a7 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1750,7 +1750,12 @@ class Core(object):
             password = args[1]
         if tab and tab.joined:       # if we are already in the room
             self.focus_tab_named(tab.name)
+            if tab.own_nick == nick:
+                self.information('/join: Nothing to do.', 'Info')
+            else:
+                tab.command_nick(nick)
             return
+
         if room.startswith('@'):
             room = room[1:]
         current_status = self.get_status()