diff --git a/settingsui/csettingsdialog.cpp b/settingsui/csettingsdialog.cpp
index 0d9fae7..0952ff3 100644
--- a/settingsui/csettingsdialog.cpp
+++ b/settingsui/csettingsdialog.cpp
@@ -19,10 +19,13 @@ CSettingsDialog::CSettingsDialog(QWidget *parent) :
 	ui->splitter->setStretchFactor(0, 0);
 	ui->splitter->setStretchFactor(1, 1);
 
-	connect(ui->pageList, &QListWidget::itemClicked, this, &CSettingsDialog::pageChanged);
+	connect(ui->pageList, &QListWidget::currentItemChanged, this, &CSettingsDialog::pageChanged);
 	ui->pageList->setResizeMode(QListWidget::Adjust);
 
 	new QShortcut(QKeySequence("Ctrl+Shift+W"), this, this, &CSettingsDialog::wipeSettings);
+
+	ui->pageList->setFocus();
+	setTabOrder(ui->pageList, nullptr);
 }
 
 CSettingsDialog::~CSettingsDialog()
@@ -40,7 +43,12 @@ CSettingsDialog& CSettingsDialog::addSettingsPage(CSettingsPage* page, const QSt
 	ui->pageList->addItem(item);
 
 	if (ui->pages->count() == 1)
+	{
 		ui->pageList->setCurrentRow(0);
+		setTabOrder(ui->pageList, page);
+	}
+	else
+		setTabOrder(ui->pages->widget(ui->pages->count() - 1), page);
 
 	ui->pageList->adjustSize();
 
diff --git a/settingsui/csettingsdialog.ui b/settingsui/csettingsdialog.ui
index c8828f1..c5d6598 100644
--- a/settingsui/csettingsdialog.ui
+++ b/settingsui/csettingsdialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>741</width>
+    <width>622</width>
     <height>437</height>
    </rect>
   </property>
@@ -26,11 +26,21 @@
       <bool>false</bool>
      </property>
      <widget class="QListWidget" name="pageList"/>
-     <widget class="QStackedWidget" name="pages"/>
+     <widget class="QStackedWidget" name="pages">
+      <property name="minimumSize">
+       <size>
+        <width>50</width>
+        <height>0</height>
+       </size>
+      </property>
+     </widget>
     </widget>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="focusPolicy">
+      <enum>Qt::TabFocus</enum>
+     </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
@@ -41,6 +51,9 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>pageList</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>