diff --git a/options.py b/options.py
index 5f40f5e..d67d784 100644
--- a/options.py
+++ b/options.py
@@ -42,12 +42,12 @@ class Settings(QtGui.QDialog):
         callwords_layout = QtGui.QVBoxLayout(callwords_tab)
         callwords_layout.setAlignment(QtCore.Qt.AlignTop)
         
-        savebtn = QtGui.QPushButton()
-        savebtn.setText("Save")
-        savebtn.clicked.connect(self.onSaveClicked)
-        cancelbtn = QtGui.QPushButton()
-        cancelbtn.setText("Cancel")
-        cancelbtn.clicked.connect(self.onCancelClicked)
+        self.savebtn = QtGui.QPushButton()
+        self.savebtn.setText("Save")
+        self.savebtn.clicked.connect(self.onSaveClicked)
+        self.cancelbtn = QtGui.QPushButton()
+        self.cancelbtn.setText("Cancel")
+        self.cancelbtn.clicked.connect(self.onCancelClicked)
         
         separators = []
         for i in range(5):
@@ -131,11 +131,11 @@ class Settings(QtGui.QDialog):
         savechangeswarn = QtGui.QLabel()
         savechangeswarn.setText("* Change takes effect upon restarting the client")
         
-        general_layout.addWidget(self.savetolog)
-        general_layout.addWidget(self.savetolog_combine, 0, QtCore.Qt.AlignRight)
-        general_layout.addWidget(separators[0])
         general_layout.addLayout(defaultoocname_layout)
         general_layout.addLayout(defaultshowname_layout)
+        general_layout.addWidget(separators[0])
+        general_layout.addWidget(self.savetolog)
+        general_layout.addWidget(self.savetolog_combine)
         general_layout.addWidget(separators[1])
         general_layout.addWidget(allowdownload)
         general_layout.addLayout(allowdownload_layout)
@@ -196,10 +196,12 @@ class Settings(QtGui.QDialog):
         self.tabs.addTab(audio_tab, "Audio")
         self.tabs.addTab(callwords_tab, "Callwords")
         
-        save_layout.addWidget(savebtn, 100, QtCore.Qt.AlignRight)
-        save_layout.addWidget(cancelbtn, 0, QtCore.Qt.AlignRight)
+        save_layout.addWidget(self.savebtn, 100, QtCore.Qt.AlignRight)
+        save_layout.addWidget(self.cancelbtn, 0, QtCore.Qt.AlignRight)
         main_layout.addWidget(self.tabs)
         main_layout.addLayout(save_layout)
+        
+        self.savebtn.setFocus()
     
     def showSettings(self):
         if exists("AO2XP.ini"):