diff --git a/libs/kimath/include/geometry/eda_angle.h b/libs/kimath/include/geometry/eda_angle.h
index b0f926c374..224d8108f4 100644
--- a/libs/kimath/include/geometry/eda_angle.h
+++ b/libs/kimath/include/geometry/eda_angle.h
@@ -52,7 +52,7 @@ public:
             break;
 
         case TENTHS_OF_A_DEGREE_T:
-            m_value = aValue * 10.0;
+            m_value = aValue / 10.0;
             break;
 
         default:
diff --git a/pcbnew/dialogs/panel_edit_options.cpp b/pcbnew/dialogs/panel_edit_options.cpp
index b28c731566..d7177ba31c 100644
--- a/pcbnew/dialogs/panel_edit_options.cpp
+++ b/pcbnew/dialogs/panel_edit_options.cpp
@@ -42,6 +42,8 @@ PANEL_EDIT_OPTIONS::PANEL_EDIT_OPTIONS( wxWindow* aParent, EDA_BASE_FRAME* aUnit
     m_flipLeftRight->Show( !m_isFootprintEditor );
     m_allowFreePads->Show( !m_isFootprintEditor );
 
+    m_rotationAngle.SetUnits( EDA_UNITS::DEGREES );
+
 #ifdef __WXOSX_MAC__
     m_mouseCmdsOSX->Show( true );
     m_mouseCmdsWinLin->Show( false );
diff --git a/pcbnew/footprint_editor_settings.cpp b/pcbnew/footprint_editor_settings.cpp
index 3f48a519ea..994e2b4ab5 100644
--- a/pcbnew/footprint_editor_settings.cpp
+++ b/pcbnew/footprint_editor_settings.cpp
@@ -93,7 +93,8 @@ FOOTPRINT_EDITOR_SETTINGS::FOOTPRINT_EDITOR_SETTINGS() :
             },
             [this] ( int aVal )
             {
-                m_RotationAngle = EDA_ANGLE( aVal, TENTHS_OF_A_DEGREE_T );
+                if( aVal )
+                    m_RotationAngle = EDA_ANGLE( aVal, TENTHS_OF_A_DEGREE_T );
             },
             900 ) );
 
diff --git a/pcbnew/pcbnew_settings.cpp b/pcbnew/pcbnew_settings.cpp
index 5018ed886a..e009d890f0 100644
--- a/pcbnew/pcbnew_settings.cpp
+++ b/pcbnew/pcbnew_settings.cpp
@@ -139,7 +139,8 @@ PCBNEW_SETTINGS::PCBNEW_SETTINGS()
             },
             [this] ( int aVal )
             {
-                m_RotationAngle = EDA_ANGLE( aVal, TENTHS_OF_A_DEGREE_T );
+                if( aVal )
+                    m_RotationAngle = EDA_ANGLE( aVal, TENTHS_OF_A_DEGREE_T );
             },
             900 ) );