Fixed workspace change notification handling

Fixed #1839

review: @devoncarew