diff --git a/desktop-widgets/locationInformation.ui b/desktop-widgets/locationInformation.ui
index c0145ca2d..c15c713fd 100644
--- a/desktop-widgets/locationInformation.ui
+++ b/desktop-widgets/locationInformation.ui
@@ -55,7 +55,11 @@
     </widget>
    </item>
    <item row="7" column="2" rowspan="2" colspan="2">
-    <widget class="QPlainTextEdit" name="diveSiteNotes"/>
+    <widget class="QPlainTextEdit" name="diveSiteNotes">
+     <property name="focusPolicy">
+      <enum>Qt::ClickFocus</enum>
+     </property>
+    </widget>
    </item>
    <item row="1" column="2" colspan="2">
     <widget class="QLineEdit" name="diveSiteName"/>
@@ -101,6 +105,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="focusPolicy">
+         <enum>Qt::ClickFocus</enum>
+        </property>
         <property name="selectionMode">
          <enum>QAbstractItemView::MultiSelection</enum>
         </property>
@@ -159,6 +166,15 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>diveSiteName</tabstop>
+  <tabstop>diveSiteCountry</tabstop>
+  <tabstop>diveSiteCoordinates</tabstop>
+  <tabstop>geoCodeButton</tabstop>
+  <tabstop>diveSiteDescription</tabstop>
+  <tabstop>diveSiteNotes</tabstop>
+  <tabstop>diveSiteListView</tabstop>
+ </tabstops>
  <resources>
   <include location="../subsurface.qrc"/>
  </resources>