diff --git a/libretroshare/src/retroshare/rsgxsifacehelper.h b/libretroshare/src/retroshare/rsgxsifacehelper.h
index 8d12893f4..0d9965c6c 100644
--- a/libretroshare/src/retroshare/rsgxsifacehelper.h
+++ b/libretroshare/src/retroshare/rsgxsifacehelper.h
@@ -393,7 +393,7 @@ protected:
 	 */
 	RsTokenService::GxsRequestStatus waitToken(
 	        uint32_t token,
-	        std::chrono::milliseconds maxWait = std::chrono::milliseconds(10000),
+	        std::chrono::milliseconds maxWait = std::chrono::milliseconds(20000),
 	        std::chrono::milliseconds checkEvery = std::chrono::milliseconds(100),
             bool auto_delete_if_unsuccessful=true)
 	{
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index d07c73358..08833d9e0 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -169,13 +169,15 @@ void GxsGroupFrameDialog::initUi()
 		connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
 		settingsChanged();
 	}
+
+	mInitialized = true;
 }
 
 void GxsGroupFrameDialog::showEvent(QShowEvent *event)
 {
-	if (!mInitialized) {
+	if (!mInitialized || ui->groupTreeWidget->treeWidget()->topLevelItemCount() == 0)
+	{
 		/* Problem: virtual methods cannot be used in constructor */
-		mInitialized = true;
 
 		initUi();
 	}
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index 2b82fd530..1314c1b1d 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -392,11 +392,10 @@ void GxsForumThreadWidget::blank()
 
     //mThreadModel->clear();
 
-#ifdef SUSPENDED_CODE
     mStateHelper->setWidgetEnabled(ui->newthreadButton, false);
 	mStateHelper->setWidgetEnabled(ui->previousButton, false);
 	mStateHelper->setWidgetEnabled(ui->nextButton, false);
-#endif
+
 	ui->versions_CB->hide();
 }