diff --git a/gui/contextMenu.py b/gui/contextMenu.py
index d7683818c..2c15a3fb2 100644
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -68,7 +68,7 @@ class ContextMenu(object):
             if amount > 0 and i != len(contexts) - 1:
                 menu.AppendSeparator()
 
-        return menu
+        return menu if empty is False else None
 
     @classmethod
     def handler(cls, event):