diff --git a/scripts/modules/rna_keymap_ui.py b/scripts/modules/rna_keymap_ui.py
index 41f47be2822..ba7c96d3487 100644
--- a/scripts/modules/rna_keymap_ui.py
+++ b/scripts/modules/rna_keymap_ui.py
@@ -66,6 +66,8 @@ def draw_km(display_keymaps, kc, km, children, layout, level):
 
         if km.is_user_modified:
             subrow.operator("preferences.keymap_restore", text="Restore")
+            # Add margin to space the button from the scrollbar.
+            subrow.separator()
         if km.is_modal:
             subrow.label(text="", icon='LINKED')
         del subrow
@@ -157,6 +159,9 @@ def draw_kmi(display_keymaps, kc, km, kmi, layout, level):
             icon=('TRACKING_CLEAR_BACKWARDS' if kmi.is_user_defined else 'X')
         ).item_id = kmi.id
 
+    # Add margin to space the buttons from the scrollbar.
+    row.separator(factor=0.25 if kmi.show_expanded else 1.0)
+
     # Expanded, additional event settings
     if kmi.show_expanded:
         box = col.box()
@@ -345,6 +350,8 @@ def draw_filtered(display_keymaps, filter_type, filter_text, layout):
                 subrow = row.row()
                 subrow.alignment = 'RIGHT'
                 subrow.operator("preferences.keymap_restore", text="Restore")
+                # Add margin to space the button from the scrollbar.
+                subrow.separator()
 
             for kmi in filtered_items:
                 draw_kmi(display_keymaps, kc, km, kmi, col, 1)