diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 9c83431f54..ccd92c9ba3 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1664,16 +1664,28 @@
                 "small_skin_width":
                 {
                     "label": "Small Top/Bottom Width",
-                    "description": "Small top/bottom regions are filled with walls instead of the default top/bottom pattern. This helps to avoids jerky motions.",
+                    "description": "Small top/bottom regions are filled with walls instead of the default top/bottom pattern. This helps to avoids jerky motions. Off for the topmost (air-exposed) layer by default (see 'Small Top/Bottom On Surface').",
                     "value": "skin_line_width * 2",
                     "default_value": 1,
                     "minimum_value": "0",
+                    "maximum_value_warning": "skin_line_width * 3",
                     "type": "float",
                     "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'",
                     "limit_to_extruder": "top_bottom_extruder_nr",
                     "settable_per_mesh": true,
                     "unit": "mm"
                 },
+                "small_skin_on_surface":
+                {
+                    "label": "Small Top/Bottom On Surface",
+                    "description": "Enable small (up to 'Small Top/Bottom Width') regions on the topmost skinned layer (exposed to air) to be filled with walls instead of the default pattern.",
+                    "value": "False",
+                    "default_value": false,
+                    "type": "bool",
+                    "enabled": "small_skin_width > 0 and top_layers > 0",
+                    "limit_to_extruder": "top_bottom_extruder_nr",
+                    "settable_per_mesh": true
+                },
                 "skin_no_small_gaps_heuristic":
                 {
                     "label": "No Skin in Z Gaps",
diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg
index a744c8eae8..c3451d2c98 100644
--- a/resources/setting_visibility/advanced.cfg
+++ b/resources/setting_visibility/advanced.cfg
@@ -34,6 +34,8 @@ bottom_thickness
 bottom_layers
 ironing_enabled
 skin_monotonic
+small_skin_width
+small_skin_on_surface
 
 [infill]
 infill_extruder_nr
diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg
index 9247ad1b9e..5388681e8f 100644
--- a/resources/setting_visibility/expert.cfg
+++ b/resources/setting_visibility/expert.cfg
@@ -60,6 +60,7 @@ skin_monotonic
 connect_skin_polygons
 skin_angles
 small_skin_width
+small_skin_on_surface
 skin_no_small_gaps_heuristic
 skin_outline_count
 ironing_enabled