diff --git a/gradle.properties b/gradle.properties
index 48c520d8e..e6757d546 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ projectVersion=0.7.10-SNAPSHOT
 pluginSinceBuild=231
 
 platformType=IU
-ideVersion=2023.1.4
+ideVersion=2023.2.2
 platformDownloadSources=true
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
diff --git a/insight/build.gradle.kts b/insight/build.gradle.kts
index 3d3958b12..ebb3d0b4d 100644
--- a/insight/build.gradle.kts
+++ b/insight/build.gradle.kts
@@ -14,7 +14,7 @@ group = "plus.sourceplus.interface"
 version = project.properties["projectVersion"] as String? ?: projectVersion
 
 intellij {
-    plugins.set(listOf("java", "Groovy", "Kotlin", "org.intellij.scala:2023.1.7", "JavaScript", "Pythonid:231.9225.16", "intellij.grid.impl"))
+    plugins.set(listOf("java", "Groovy", "Kotlin", "org.intellij.scala:2023.2.23", "JavaScript", "Pythonid:232.8660.185", "intellij.grid.impl"))
 }
 
 val sourcesJar = tasks.register<Jar>("sourcesJar") {
diff --git a/marker/jvm-marker/build.gradle.kts b/marker/jvm-marker/build.gradle.kts
index cc1518a98..c40e5b619 100644
--- a/marker/jvm-marker/build.gradle.kts
+++ b/marker/jvm-marker/build.gradle.kts
@@ -14,7 +14,7 @@ group = "plus.sourceplus.interface"
 version = project.properties["projectVersion"] as String? ?: projectVersion
 
 intellij {
-    plugins.set(listOf("java", "Groovy", "Kotlin", "org.intellij.scala:2023.1.7"))
+    plugins.set(listOf("java", "Groovy", "Kotlin", "org.intellij.scala:2023.2.23"))
 }
 
 val sourcesJar = tasks.register<Jar>("sourcesJar") {
diff --git a/marker/py-marker/build.gradle.kts b/marker/py-marker/build.gradle.kts
index 93d8c9f82..7294e5826 100644
--- a/marker/py-marker/build.gradle.kts
+++ b/marker/py-marker/build.gradle.kts
@@ -14,7 +14,7 @@ version = project.properties["projectVersion"] as String? ?: projectVersion
 
 intellij {
     type.set("IC")
-    plugins.set(listOf("PythonCore:231.9225.4"))
+    plugins.set(listOf("PythonCore:232.8660.185"))
 }
 
 val sourcesJar = tasks.register<Jar>("sourcesJar") {
diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/ChangeChartAction.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/ChangeChartAction.kt
index adce02bbf..7705701e9 100644
--- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/ChangeChartAction.kt
+++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/ChangeChartAction.kt
@@ -71,6 +71,6 @@ class ChangeChartAction : AnAction(PluginIcons.chartMixed) {
                 override fun hasSubstep(selectedValue: String?): Boolean = false
                 override fun onChosen(selectedValue: String?, finalChoice: Boolean): PopupStep<*>? = null
             }
-        ).showUnderneathOf(e.inputEvent.component)
+        ).apply { e.inputEvent?.let { showUnderneathOf(it.component) } }
     }
 }
diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/ChangeTimeAction.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/ChangeTimeAction.kt
index 42aa89035..801ef5747 100644
--- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/ChangeTimeAction.kt
+++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/ChangeTimeAction.kt
@@ -106,6 +106,6 @@ class ChangeTimeAction(private val viewManager: LiveViewChartManager) : AnAction
                     return null
                 }
             }
-        ).showUnderneathOf(e.inputEvent.component)
+        ).apply { e.inputEvent?.let { showUnderneathOf(it.component) } }
     }
 }
diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/SetRefreshIntervalAction.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/SetRefreshIntervalAction.kt
index c6405d333..30cb36a30 100644
--- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/SetRefreshIntervalAction.kt
+++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/action/SetRefreshIntervalAction.kt
@@ -96,6 +96,6 @@ class SetRefreshIntervalAction(private val viewManager: ResumableViewManager) :
                     return null
                 }
             }
-        ).showUnderneathOf(e.inputEvent.component)
+        ).apply { e.inputEvent?.let { showUnderneathOf(it.component) } }
     }
 }