Fix for property popups
Merge with master