Restored double-click codes that were removed due to a merge from ChocoButterUI
Merge pull request #978 from Benglin/MAGN978

There are few teammates that are dependent on this, since there is no real code changes (these changes were removed accidentally) anyway, I'm going to shamelessly merge this in myself :)