The System Preferences-> Dock -> Prefer tabs did not help me. iMac Retina, High Sierra (10.13.3) and magic mouse. However after changing the theme (GIMP->Preferences->Theme) to OSX it seemed to correct itself.