diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp
index d18c88228..a669e059f 100644
--- a/retroshare-gui/src/gui/ForumsDialog.cpp
+++ b/retroshare-gui/src/gui/ForumsDialog.cpp
@@ -258,10 +258,10 @@ void ForumsDialog::forumListCustomPopupMenu( QPoint point )
     QMenu contextMnu( this );
 
     QAction *action = contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Subscribe to Forum"), this, SLOT(subscribeToForum()));
-    action->setDisabled (m_bIsForumSubscribed);
+    action->setDisabled (mCurrForumId.empty() || m_bIsForumSubscribed);
 
     action = contextMnu.addAction(QIcon(IMAGE_UNSUBSCRIBE), tr("Unsubscribe to Forum"), this, SLOT(unsubscribeToForum()));
-    action->setEnabled (m_bIsForumSubscribed);
+    action->setEnabled (!mCurrForumId.empty() && m_bIsForumSubscribed);
 
     contextMnu.addSeparator();