After Update of IntelliJ and Scala Plugin, IntelliJ Freezes

Ever sinceI upgraded my IntelliJ version and scala plugin IntelliJ is completely locking up on me. While not every time, it consistently does this when I am adding `extends` or `with` statements on case classes.

Mac OS Version: 

10.12.1 

IntelliJ Version:

IntelliJ IDEA 2016.3
Build #IC-163.7743.44, built on November 17, 2016
JRE: 1.8.0_112-release-408-b2 x86_64
JVM: OpenJDK 64-Bit Server VM by JetBrains s.r.o

Scala Plugin Version:

2016.3.3

Please let me know if any information is required and what steps I should take to get the information.