Fix issue with navigating to the workspace via navigation bar

Fix #568
Signed-off-by: Sheik Hassan <solergiga@yahoo.com>