diff --git a/actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt b/actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt
index 0ef3b4eca..a6dea8b03 100644
--- a/actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt
+++ b/actions/src/main/java/com/itsaky/androidide/actions/ActionItem.kt
@@ -183,7 +183,7 @@ interface ActionItem {
     }
 
     fun forId(id: String): Location {
-      return values().first { it.id == id }
+      return entries.first { it.id == id }
     }
   }
 }
diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
index 7b38cb57e..0b7be79f8 100644
--- a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
+++ b/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
@@ -348,10 +348,8 @@ open class EditorHandlerActivity : ProjectHandlerActivity(), IEditorHandler {
 
   override fun getEditorForFile(file: File): CodeEditorView? {
     for (i in 0 until editorViewModel.getOpenedFileCount()) {
-      val editor = binding.editorContainer.getChildAt(i) as CodeEditorView
-      if (file == editor.file) {
-        return editor
-      }
+      val editor = binding.editorContainer.getChildAt(i) as? CodeEditorView
+      if (file == editor?.file) return editor
     }
     return null
   }