diff --git a/VoidLink/Input/CustomOSC/LayoutOnScreenControls.m b/VoidLink/Input/CustomOSC/LayoutOnScreenControls.m
index 566a56ed..a8cbea90 100644
--- a/VoidLink/Input/CustomOSC/LayoutOnScreenControls.m
+++ b/VoidLink/Input/CustomOSC/LayoutOnScreenControls.m
@@ -14,6 +14,7 @@
 #import "OnScreenButtonState.h"
 #import "OSCProfilesManager.h"
 
+
 @interface LayoutOnScreenControls ()
 @end
 
diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
index 1e881a1c..52e5f6c2 100644
--- a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
+++ b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
@@ -239,6 +239,11 @@
                                                object:nil];
         
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(OSCLayoutChanged) name:@"OSCLayoutChanged" object:nil];    // used to notifiy this view controller that the user made a change to the OSC layout so that the VC can either fade in or out its 'Undo button' which will signify to the user whether there are any OSC layout changes to undo
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(applicationWillResignActive:)
+                                                 name:UIApplicationWillResignActiveNotification
+                                               object:nil];
 
     OnScreenWidgetView.editMode = true;
     [self handleMissingToolBarIcon:toolbarRootView];
@@ -247,6 +252,11 @@
 
 #pragma mark - Class Helper Functions
 
+- (void)applicationWillResignActive:(NSNotification *)notification {
+    [self saveTapped:nil];
+}
+
+
 /* fades the 'Undo Button' in or out depending on whether the user has any OSC layout changes to undo */
 - (void) OSCLayoutChanged {
     if ([self.layoutOSC.layoutChanges count] > 0) {
@@ -1109,6 +1119,7 @@
 }
 
 - (void) presentProfilesTableView{
+    [self saveTapped:nil];
     UIStoryboard *storyboard;
     BOOL isIPhone = ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone);
     if (isIPhone) {