diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index fe3ae741..7f050974 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -5193,13 +5193,6 @@ gui_edit_db () {
     PW_USE_WINED3D_VULKAN PW_USE_SUPPLIED_DXVK_VKD3D PW_USE_NATIVE_WAYLAND PW_USE_DXVK_HDR
     )
 
-    if check_wayland_session
-    then rm_from_array "PW_EDIT_DB_LIST" PW_USE_US_LAYOUT
-    else
-        rm_from_array "PW_EDIT_DB_LIST" PW_USE_NATIVE_WAYLAND
-        rm_from_array "PW_EDIT_DB_LIST" PW_USE_DXVK_HDR
-    fi
-
     check_flatpak && rm_from_array "PW_EDIT_DB_LIST" PW_USE_RUNTIME
 
     # GALLIUM NINE
@@ -5278,6 +5271,11 @@ gui_edit_db () {
         DISABLE_EDIT_DB_LIST+=" PW_USE_SUPPLIED_DXVK_VKD3D"
     fi
 
+    if check_wayland_session
+    then DISABLE_EDIT_DB_LIST+=" PW_USE_US_LAYOUT"
+    else DISABLE_EDIT_DB_LIST+=" PW_USE_NATIVE_WAYLAND PW_USE_DXVK_HDR"
+    fi
+
     unset ADD_CHK_BOX_EDIT_DB
     for int_to_boole in "${PW_EDIT_DB_LIST[@]}" ; do
         if [[ "${!int_to_boole}" == "1" ]]