diff --git a/src/tabs.py b/src/tabs.py
index 70c02911..8f42a0f4 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -362,7 +362,7 @@ class MucTab(ChatTab):
         self.commands['ignore'] = (self.command_ignore, _("Usage: /ignore <nickname> \nIgnore: Ignore a specified nickname."), None)
         self.commands['unignore'] = (self.command_unignore, _("Usage: /unignore <nickname>\nUnignore: Remove the specified nickname from the ignore list."), None)
         self.commands['kick'] =  (self.command_kick, _("Usage: /kick <nick> [reason]\nKick: Kick the user with the specified nickname. You also can give an optional reason."), None)
-        self.commands['topic'] = (self.command_topic, _("Usage: /topic <subject>\nTopic: Change the subject of the room"), None)
+        self.commands['topic'] = (self.command_topic, _("Usage: /topic <subject>\nTopic: Change the subject of the room"), self.completion_topic)
         self.commands['query'] = (self.command_query, _('Usage: /query <nick> [message]\nQuery: Open a private conversation with <nick>. This nick has to be present in the room you\'re currently in. If you specified a message after the nickname, it will immediately be sent to this user'), None)
         self.commands['part'] = (self.command_part, _("Usage: /part [message]\n Part: disconnect from a room. You can specify an optional message."), None)
         self.commands['nick'] = (self.command_nick, _("Usage: /nick <nickname>\nNick: Change your nickname in the current room"), None)
@@ -491,6 +491,10 @@ class MucTab(ChatTab):
         subject = arg
         muc.change_subject(self.core.xmpp, self.get_room().name, subject)
 
+    def completion_topic(self, the_input):
+        current_topic = self.get_room().topic
+        the_input.auto_completion([current_topic], ' ')
+
     def command_kick(self, arg):
         """
         /kick <nick> [reason]