Issue #23 - Fix crash on mainHub page after double clicking