Fix issue with navigating to the workspace via navigation bar

Signed-off-by: Sheik Hassan <solergiga@yahoo.com>
Merge pull request #572 from hassanNS/issue-568

Fix issue with navigating to the workspace via navigation bar