Bug Fix with empty context menu