Properly deactivate
Fix issue with multiple panes and positioning