Magic keyboard doesn't work on restart.

Hello all,

I have a new Magic Keyboard and a 2015 13" MBP Retina. Keyboard is fine from sleep to wake on the computer. When I restart, the keyboard will not work. I have to undock the MBP and enter in password on device keyboard, close MBP and work on my Thunderbolt monitor, everything is fine. However, my third party keyboards do not have this issue. Only the Apple Magic Keyboard. That seems a little ridiculous.

Thanks in advance,

David