diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index 3eb691bbf3..d734b34120 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -330,13 +330,6 @@ double TEXTE_MODULE::GetDrawRotation() const
 
     NORMALIZE_ANGLE_POS( rotation );
 
-    // For angle = 0 .. 360 deg
-    while( rotation > 2700 )
-        rotation -= 3600;
-
-    while( rotation < -900 )
-        rotation += 1800;
-
     return rotation;
 }
 
diff --git a/pcbnew/dialogs/dialog_edit_module_text.cpp b/pcbnew/dialogs/dialog_edit_module_text.cpp
index de5854f2cc..ddfe726440 100644
--- a/pcbnew/dialogs/dialog_edit_module_text.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_text.cpp
@@ -150,6 +150,7 @@ bool DialogEditModuleText::TransferDataToWindow()
     PutValueInLocalUnits( *m_TxtWidthCtlr, m_currentText->GetThickness() );
 
     double text_orient = m_currentText->GetTextAngle();
+    text_orient = NormalizeAngle180( text_orient );
 
     if( !m_currentText->IsVisible() )
         m_Show->SetSelection( 1 );