Revert "fix window cycling between plots and main window via shortcut key"

This reverts commit a7b564b094bdfa0f09bce3061d2dee6aaa892b3e.

This change broke some keyboard shortcuts (e.g. Undo)