1 files changed, 12 insertions, 0 deletions
diff --git a/src/command/command.c b/src/command/command.c
index 5b78d3e7..2a9efc0f 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -65,6 +65,7 @@
 #include "xmpp/xmpp.h"
 #include "xmpp/bookmark.h"
 #include "ui/ui.h"
+#include "ui/windows.h"
 
 typedef char*(*autocompleter)(char*, int*);
 
@@ -2078,6 +2079,17 @@ _room_autocomplete(char *input, int *size)
 {
     char *result = NULL;
 
+    ProfWin *current = wins_get_current();
+    if (current != NULL) {
+        DataForm *form = current->form;
+        if (form != NULL) {
+            result = autocomplete_param_with_ac(input, size, "/room set", form->tag_ac, TRUE);
+            if (result != NULL) {
+                return result;
+            }
+        }
+    }
+
     result = autocomplete_param_with_ac(input, size, "/room", room_ac, TRUE);
     if (result != NULL) {
         return result;