diff --git a/CHANGELOG.md b/CHANGELOG.md
index 240a4ed9f3..f0dedb4f56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Next
+- Resolve "Exception: Cannot invoke "org..AnAction.getTemplatePresentation()" exception (#7488)
 - Resolve Released EditorImpl held by lambda in FlutterReloadManager (#7507)
 - Configure the Project view for Flutter in AS, when creating a new Flutter project (#4470)
 - Migrate to Kotlin UI DSL Version 2 (#7310)
diff --git a/flutter-idea/src/io/flutter/editor/NativeEditorNotificationProvider.java b/flutter-idea/src/io/flutter/editor/NativeEditorNotificationProvider.java
index 9d502fdc9b..1866a59d82 100644
--- a/flutter-idea/src/io/flutter/editor/NativeEditorNotificationProvider.java
+++ b/flutter-idea/src/io/flutter/editor/NativeEditorNotificationProvider.java
@@ -49,14 +49,16 @@ public EditorNotificationPanel createNotificationPanel(@NotNull VirtualFile file
     return createPanelForFile(file, findRootDir(file, project.getBaseDir()));
   }
 
-  private EditorNotificationPanel createPanelForFile(VirtualFile file, VirtualFile root) {
+  @Nullable
+  private EditorNotificationPanel createPanelForFile(@NotNull VirtualFile file, @Nullable VirtualFile root) {
     if (root == null) {
       return null;
     }
     return createPanelForAction(file, root, getActionName(root));
   }
 
-  private EditorNotificationPanel createPanelForAction(VirtualFile file, VirtualFile root, String actionName) {
+  @Nullable
+  private EditorNotificationPanel createPanelForAction(@NotNull VirtualFile file, @NotNull VirtualFile root, @Nullable String actionName) {
     if (actionName == null) {
       return null;
     }
@@ -64,15 +66,18 @@ private EditorNotificationPanel createPanelForAction(VirtualFile file, VirtualFi
     return panel.isValidForFile() ? panel : null;
   }
 
-  private static String getActionName(VirtualFile root) {
+  @Nullable
+  private static String getActionName(@Nullable VirtualFile root) {
     if (root == null) {
       return null;
     }
 
-    if (root.getName().equals("android")) {
-      return "flutter.androidstudio.open";
-    }
-    else if (root.getName().equals("ios")) {
+    // See https://github.com/flutter/flutter-intellij/issues/7103
+    //if (root.getName().equals("android")) {
+    //  return "flutter.androidstudio.open";
+    //}
+    //else
+    if (root.getName().equals("ios")) {
       return "flutter.xcode.open";
     }
     else if (root.getName().equals("macos")) {
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 22a6176f01..4fdaa77632 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -47,6 +47,7 @@
     <![CDATA[
 <h1>Next</h1>
 <ul>
+  <li>Resolve &quot;Exception: Cannot invoke &quot;org..AnAction.getTemplatePresentation()&quot; exception (#7488)</li>
   <li>Resolve Released EditorImpl held by lambda in FlutterReloadManager (#7507)</li>
   <li>Configure the Project view for Flutter in AS, when creating a new Flutter project (#4470)</li>
   <li>Migrate to Kotlin UI DSL Version 2 (#7310)</li>