Fixed multiple event registering on 'add space' click

Note: This is temporal. Should find a better solution.