Curve Editor Modality stuck behind main window

When using the curve editor and then clicking back to the main window, the curve editor is put behind (as expected) however the curve editor button does not bring the window back to the front.