diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6296dbd1c..9fb79fc63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change log
 
+## Development version
+
+### Bug fixes
+
+- The tab order of controls on the Grouping tab on the playlist view preferences
+  page was corrected. [[#781](https://github.com/reupen/columns_ui/pull/781)]
+
 ## 2.1.0-beta.3
 
 ### Bug fixes
diff --git a/foo_ui_columns/foo_ui_columns.rc b/foo_ui_columns/foo_ui_columns.rc
index 67dcad399..21521118c 100644
--- a/foo_ui_columns/foo_ui_columns.rc
+++ b/foo_ui_columns/foo_ui_columns.rc
@@ -372,19 +372,19 @@ STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
-    CONTROL         "Show groups",IDC_GROUPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,57,10
-    PUSHBUTTON      "Move up",IDC_GROUP_UP,7,251,50,14
-    PUSHBUTTON      "Move down",IDC_GROUP_DOWN,60,251,50,14
-    PUSHBUTTON      "New...",IDC_GROUP_NEW,217,251,50,14
-    PUSHBUTTON      "Delete",IDC_GROUP_DELETE,270,251,50,14
     LTEXT           "Grouping",IDC_TITLE1,7,4,307,16
+    CONTROL         "Show groups",IDC_GROUPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,57,10
     CONTROL         "Indent each level of grouping",IDC_INDENT_GROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,121,10
+    CONTROL         "Use a custom amount of indentation:",IDC_USE_CUSTOM_INDENTATION,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,137,10
     EDITTEXT        IDC_INDENTATION_AMOUNT,147,64,40,14,ES_AUTOHSCROLL
     CONTROL         "",IDC_INDENTATION_AMOUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,199,65,12,10
     LTEXT           "px",-1,189,67,9,8
     LTEXT           "Groups",IDC_H2_TITLE,7,89,313,13
-    CONTROL         "Use a custom amount of indentation:",IDC_USE_CUSTOM_INDENTATION,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,137,10
+    PUSHBUTTON      "Move up",IDC_GROUP_UP,7,251,50,14
+    PUSHBUTTON      "Move down",IDC_GROUP_DOWN,60,251,50,14
+    PUSHBUTTON      "New...",IDC_GROUP_NEW,217,251,50,14
+    PUSHBUTTON      "Delete",IDC_GROUP_DELETE,270,251,50,14
 END
 
 IDD_PREFS_FILTER_FIELDS DIALOGEX 0, 0, 327, 271
diff --git a/foo_ui_columns/ng_playlist/ng_playlist_prefs_groups.cpp b/foo_ui_columns/ng_playlist/ng_playlist_prefs_groups.cpp
index 241fa56c0..16634ca0d 100644
--- a/foo_ui_columns/ng_playlist/ng_playlist_prefs_groups.cpp
+++ b/foo_ui_columns/ng_playlist/ng_playlist_prefs_groups.cpp
@@ -72,6 +72,7 @@ BOOL GroupsPreferencesTab::ConfigProc(HWND wnd, UINT msg, WPARAM wp, LPARAM lp)
     case WM_INITDIALOG: {
         m_wnd = wnd;
         m_groups_list_view.create(wnd, {7, 105, 313, 140}, true);
+        SetWindowPos(m_groups_list_view.get_wnd(), GetDlgItem(wnd, IDC_H2_TITLE), 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 
         LOGFONT font{};
         GetObject(GetWindowFont(wnd), sizeof(font), &font);