diff --git a/lib/states/editor.rb b/lib/states/editor.rb
index 9f07a93..20471e9 100644
--- a/lib/states/editor.rb
+++ b/lib/states/editor.rb
@@ -172,14 +172,11 @@ class Editor < CyberarmEngine::GuiState
     @status_bar.clear
     @body.clear
 
-    if window.backend.settings.config.empty?
-      if [TAC::Pages::Home, TAC::Pages::TACNET, TAC::Pages::Simulator, TAC::Pages::Configurations].include?(klass)
-      else
-        push_state(TAC::Dialog::AlertDialog, title: "No Config Loaded", message: "A config must be loaded.")
-        page(TAC::Pages::Configurations)
+    if window.backend.settings.config.empty? && page_requires_configuration?(klass)
+      push_state(TAC::Dialog::AlertDialog, title: "No Config Loaded", message: "A config must be loaded.")
+      page(TAC::Pages::Configurations)
 
-        return
-      end
+      return
     end
 
     @page.blur if @page
@@ -191,4 +188,12 @@ class Editor < CyberarmEngine::GuiState
     @page.setup
     @page.focus
   end
+
+  def page_requires_configuration?(klass)
+    [
+      TAC::Pages::Editor,
+      TAC::Pages::Presets,
+      TAC::Pages::Search
+    ].include?(klass)
+  end
 end
\ No newline at end of file
diff --git a/timecrafters_configuration_tool.rb b/timecrafters_configuration_tool.rb
index c12c6d8..e0b14dc 100644
--- a/timecrafters_configuration_tool.rb
+++ b/timecrafters_configuration_tool.rb
@@ -1,4 +1,5 @@
 begin
+  raise LoadError if defined?(Ocra)
   require_relative "../cyberarm_engine/lib/cyberarm_engine"
 rescue LoadError
   require "cyberarm_engine"