diff --git a/ApplicationView/MainApplicationWidget.cs b/ApplicationView/MainApplicationWidget.cs
index 1a3b63243..6358f2641 100644
--- a/ApplicationView/MainApplicationWidget.cs
+++ b/ApplicationView/MainApplicationWidget.cs
@@ -179,6 +179,9 @@ namespace MatterHackers.MatterControl
 
 	public class ApplicationController
 	{
+		public Action RedeemDesignCode;
+		public Action EnterShareCode;
+
 		private static ApplicationController globalInstance;
 		public RootedObjectEventHandler AdvancedControlsPanelReloading = new RootedObjectEventHandler();
 		public RootedObjectEventHandler CloudSyncStatusChanged = new RootedObjectEventHandler();
diff --git a/ApplicationView/MenuRow/MenuOptionFile.cs b/ApplicationView/MenuRow/MenuOptionFile.cs
index 5473674be..8663d3c77 100644
--- a/ApplicationView/MenuRow/MenuOptionFile.cs
+++ b/ApplicationView/MenuRow/MenuOptionFile.cs
@@ -33,8 +33,8 @@ namespace MatterHackers.MatterControl
 				new MenuItemAction("Add Printer".Localize(), AddPrinter_Click),
 				new MenuItemAction("Import Printer".Localize(), ImportPrinter),
 				new MenuItemAction("Add File To Queue".Localize(), importFile_Click),
-				new MenuItemAction("Redeem Design Code".Localize(), () => MatterControlApplication.Instance.RedeemDesignCode?.Invoke()),
-				new MenuItemAction("Enter Share Code".Localize(), () => MatterControlApplication.Instance.EnterShareCode?.Invoke()),
+				new MenuItemAction("Redeem Design Code".Localize(), () => ApplicationController.Instance.RedeemDesignCode?.Invoke()),
+				new MenuItemAction("Enter Share Code".Localize(), () => ApplicationController.Instance.EnterShareCode?.Invoke()),
 				new MenuItemAction("------------------------", null),
 				new MenuItemAction("Exit".Localize(), () =>
 				{
diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs
index d8bfc37f6..9d727be3d 100644
--- a/MatterControlApplication.cs
+++ b/MatterControlApplication.cs
@@ -64,9 +64,6 @@ namespace MatterHackers.MatterControl
 		public static string MCWSBaseUri { get; } = "https://mattercontrol.appspot.com";
 #endif
 
-		public Action RedeemDesignCode;
-		public Action EnterShareCode;
-
 		public static bool CameraInUseByExternalProcess { get; set; } = false;
 		public bool RestartOnClose = false;
 		private static readonly Vector2 minSize = new Vector2(600, 600);
diff --git a/SetupWizard/AndroidSetupOptionsPage.cs b/SetupWizard/AndroidSetupOptionsPage.cs
index 49c18bbe5..c9dbc9ded 100644
--- a/SetupWizard/AndroidSetupOptionsPage.cs
+++ b/SetupWizard/AndroidSetupOptionsPage.cs
@@ -219,7 +219,7 @@ namespace MatterHackers.MatterControl
 			redeemPurchaseButton.Margin = new BorderDouble(0, 0, 10, 0);
 			redeemPurchaseButton.Click += (sender, e) =>
 			{
-				MatterControlApplication.Instance.RedeemDesignCode?.Invoke();
+				ApplicationController.Instance.RedeemDesignCode?.Invoke();
 			};
 			buttonContainer.AddChild(redeemPurchaseButton);
 
@@ -230,7 +230,7 @@ namespace MatterHackers.MatterControl
 			redeemShareButton.Margin = new BorderDouble(0, 0, 10, 0);
 			redeemShareButton.Click += (sender, e) =>
 			{
-				MatterControlApplication.Instance.EnterShareCode?.Invoke();
+				ApplicationController.Instance.EnterShareCode?.Invoke();
 			};
 
 			if (!signedIn)