diff --git a/Limelight/Localization/Localizable.xcstrings b/Limelight/Localization/Localizable.xcstrings
index 3d95b9e8..0a30eecd 100644
--- a/Limelight/Localization/Localizable.xcstrings
+++ b/Limelight/Localization/Localizable.xcstrings
@@ -2263,6 +2263,29 @@
         }
       }
     },
+    "Shape (r - round, s - square)" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "按键形状 (r - 圆形, s - 方形)"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "按键形状 (r - 圆形, s - 方形)"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "按键形状 (r - 圆形, s - 方形)"
+          }
+        }
+      }
+    },
     "Show App" : {
       "extractionState" : "manual",
       "localizations" : {
diff --git a/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m b/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
index b1a048da..a8ee5bf9 100644
--- a/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
+++ b/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
@@ -385,8 +385,9 @@
         if(noValidKeyboardString && noValidMouseButtonString && noValidTouchPadString && noValidOscButtonString && noValidSpecialButtonString && noValidSuperComboButtonString && noValidSpecialGameWidgetString) return;
         
         if([widgetShape isEqualToString:@"r"]) widgetShape = @"round";
-        if([widgetShape isEqualToString:@"s"]) widgetShape = @"square";
-        if([widgetShape isEqualToString:@""]) widgetShape = @"default";
+        else if([widgetShape isEqualToString:@"s"]) widgetShape = @"square";
+        else if([widgetShape isEqualToString:@""]) widgetShape = @"default";
+        else return;
         //saving & present the keyboard button:
         OnScreenWidgetView* widgetView = [[OnScreenWidgetView alloc] initWithKeyString:cmdString keyLabel:keyLabel shape:widgetShape];
         widgetView.translatesAutoresizingMaskIntoConstraints = NO; // weird but this is mandatory, or you will find no key views added to the right place