diff --git a/project.godot b/project.godot
index 951338f..08eb1ed 100644
--- a/project.godot
+++ b/project.godot
@@ -124,7 +124,6 @@ driver="Dummy"
 Global="*res://src/Autoload/Global.gd"
 OpenSave="*res://src/Autoload/OpenSave.gd"
 Tools="*res://src/Autoload/Tools.gd"
-Export="*res://src/Autoload/Export.gd"
 
 [debug]
 
diff --git a/src/Autoload/OpenSave.gd b/src/Autoload/OpenSave.gd
index d2e2305..4d63366 100644
--- a/src/Autoload/OpenSave.gd
+++ b/src/Autoload/OpenSave.gd
@@ -1,5 +1,6 @@
 extends Node
 
+var Export = preload("res://src/Autoload/Export.gd")
 
 var current_save_paths := [] # Array of strings
 # Stores a filename of a backup file in user:// until user saves manually
diff --git a/src/Classes/ImageEffect.gd b/src/Classes/ImageEffect.gd
index 75a83ab..11af6c3 100644
--- a/src/Classes/ImageEffect.gd
+++ b/src/Classes/ImageEffect.gd
@@ -2,6 +2,7 @@ class_name ImageEffect extends AcceptDialog
 # Parent class for all image effects
 # Methods that have "pass" are meant to be replaced by the inherited Scripts
 
+var Export = preload("res://src/Autoload/Export.gd")
 
 enum {CEL, FRAME, ALL_FRAMES, ALL_PROJECTS}
 
diff --git a/src/Classes/Project.gd b/src/Classes/Project.gd
index 6f4bc71..55f9da3 100644
--- a/src/Classes/Project.gd
+++ b/src/Classes/Project.gd
@@ -1,6 +1,7 @@
 class_name Project extends Reference
 # A class for project properties.
 
+var Export = preload("res://src/Autoload/Export.gd")
 
 var name := "" setget name_changed
 var size : Vector2 setget size_changed
diff --git a/src/Main.gd b/src/Main.gd
index 161ff4d..f9e370a 100644
--- a/src/Main.gd
+++ b/src/Main.gd
@@ -1,6 +1,8 @@
 extends Control
 
-var Import = preload("res://src/Autoload/Import.gd")
+var Export = preload("res://src/Autoload/Export.gd")
+var ImportScript = preload("res://src/Autoload/Import.gd")
+var Import = ImportScript.new()
 
 var opensprite_file_selected := false
 var redone := false
diff --git a/src/UI/Dialogs/ExportDialog.gd b/src/UI/Dialogs/ExportDialog.gd
index 334ab10..aaa4762 100644
--- a/src/UI/Dialogs/ExportDialog.gd
+++ b/src/UI/Dialogs/ExportDialog.gd
@@ -1,5 +1,8 @@
 extends AcceptDialog
 
+var ExportScript = preload("res://src/Autoload/Export.gd")
+var Export = ExportScript.new()
+
 # called when user resumes export after filename collision
 signal resume_export_function()
 
diff --git a/src/UI/TopMenuContainer.gd b/src/UI/TopMenuContainer.gd
index 6afa3c6..3b90ed3 100644
--- a/src/UI/TopMenuContainer.gd
+++ b/src/UI/TopMenuContainer.gd
@@ -1,11 +1,14 @@
 extends Panel
 
+var Export = preload("res://src/Autoload/Export.gd")
 var DrawingAlgos = preload("res://src/Autoload/DrawingAlgos.gd")
 
 var file_menu : PopupMenu
 var view_menu : PopupMenu
 var zen_mode := false
 
+var was_exported = false
+
 
 func _ready() -> void:
 	setup_file_menu()
@@ -173,7 +176,7 @@ func save_project_file_as() -> void:
 
 
 func export_file() -> void:
-	if Export.was_exported == false:
+	if was_exported == false:
 		Global.export_dialog.popup_centered()
 		Global.dialog_open(true)
 	else: