diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
index f5a1dcfcd..72a43e68c 100644
--- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
+++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
@@ -65,6 +65,15 @@ void  CreateForumMsg::newMsg()
 
 		ui.forumName->setText(name);
 		ui.forumSubject->setText(subj);
+		
+		if (!ui.forumSubject->text().isEmpty())
+		{
+      ui.forumMessage->setFocus();
+    }
+		else
+		{
+      ui.forumSubject->setFocus();
+		}
 
 		if (fi.forumFlags & RS_DISTRIB_AUTHEN_REQ)
 		{