Fix fullscreen bug reversion

During today's merges with the master branch, the fullscreen bug that was fixed last week reverted.  I have re-patched the bug.