diff --git a/UI/CWorldEditor.ui b/UI/CWorldEditor.ui
index 1baa3f06..3a5c92f1 100644
--- a/UI/CWorldEditor.ui
+++ b/UI/CWorldEditor.ui
@@ -153,7 +153,10 @@
           </size>
          </property>
          <property name="focusPolicy">
-          <enum>Qt::NoFocus</enum>
+          <enum>Qt::TabFocus</enum>
+         </property>
+         <property name="contextMenuPolicy">
+          <enum>Qt::NoContextMenu</enum>
          </property>
          <property name="correctionMode">
           <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
@@ -203,7 +206,10 @@
           </size>
          </property>
          <property name="focusPolicy">
-          <enum>Qt::NoFocus</enum>
+          <enum>Qt::TabFocus</enum>
+         </property>
+         <property name="contextMenuPolicy">
+          <enum>Qt::NoContextMenu</enum>
          </property>
          <property name="correctionMode">
           <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
@@ -253,7 +259,10 @@
           </size>
          </property>
          <property name="focusPolicy">
-          <enum>Qt::ClickFocus</enum>
+          <enum>Qt::TabFocus</enum>
+         </property>
+         <property name="contextMenuPolicy">
+          <enum>Qt::NoContextMenu</enum>
          </property>
          <property name="correctionMode">
           <enum>QAbstractSpinBox::CorrectToNearestValue</enum>
@@ -302,6 +311,9 @@
            <property name="focusPolicy">
             <enum>Qt::NoFocus</enum>
            </property>
+           <property name="contextMenuPolicy">
+            <enum>Qt::NoContextMenu</enum>
+           </property>
            <property name="frame">
             <bool>true</bool>
            </property>
@@ -458,6 +470,9 @@
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
       <widget class="QTabWidget" name="TabWidget">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
        <property name="tabPosition">
         <enum>QTabWidget::North</enum>
        </property>
@@ -465,7 +480,7 @@
         <enum>QTabWidget::Rounded</enum>
        </property>
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <property name="iconSize">
         <size>
@@ -882,6 +897,12 @@
    <header>WDraggableSpinBox.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>XSpinBox</tabstop>
+  <tabstop>YSpinBox</tabstop>
+  <tabstop>ZSpinBox</tabstop>
+  <tabstop>TabWidget</tabstop>
+ </tabstops>
  <resources>
   <include location="../Icons.qrc"/>
  </resources>
diff --git a/UI/WDraggableSpinBox.cpp b/UI/WDraggableSpinBox.cpp
index 130ec2ac..453242a4 100644
--- a/UI/WDraggableSpinBox.cpp
+++ b/UI/WDraggableSpinBox.cpp
@@ -17,11 +17,14 @@ WDraggableSpinBox::~WDraggableSpinBox()
 {
 }
 
-void WDraggableSpinBox::mousePressEvent(QMouseEvent*)
+void WDraggableSpinBox::mousePressEvent(QMouseEvent *pEvent)
 {
-    mBeingDragged = true;
-    mBeenDragged = false;
-    mLastY = QCursor::pos().y();
+    if (pEvent->button() == Qt::LeftButton)
+    {
+        mBeingDragged = true;
+        mBeenDragged = false;
+        mLastY = QCursor::pos().y();
+    }
 }
 
 void WDraggableSpinBox::mouseReleaseEvent(QMouseEvent *Event)