diff --git a/data/stk_config.xml b/data/stk_config.xml
index 37c5c1b60..ae81fe090 100644
--- a/data/stk_config.xml
+++ b/data/stk_config.xml
@@ -109,6 +109,10 @@
       work anymore - so for now don't enable this. -->
   <networking enable="false"/>
 
+  <!-- Disable steering when stop skidding during the time it takes to
+       adjust the physical body with the graphics. -->
+  <steer disable-while-unskid="true"/>
+
   <!-- Default values for all karts
        ============================ -->
   <general-kart-defaults>
diff --git a/src/config/stk_config.cpp b/src/config/stk_config.cpp
index 14bcf8601..9dc111f4b 100644
--- a/src/config/stk_config.cpp
+++ b/src/config/stk_config.cpp
@@ -177,6 +177,7 @@ void STKConfig::init_defaults()
     m_smooth_normals           = false;
     m_same_powerup_mode        = POWERUP_MODE_ONLY_IF_SAME;
     m_ai_acceleration          = 1.0f;
+    m_disable_steer_while_unskid = false;
     
     m_score_increase.clear();
     m_leader_intervals.clear();
@@ -252,6 +253,11 @@ void STKConfig::getAllData(const XMLNode * root)
         news_node->get("max-display", &m_max_display_news);
     }
 
+    if (const XMLNode *steer_node= root->getNode("steer"))
+    {
+        steer_node->get("disable-while-unskid", &m_disable_steer_while_unskid);
+    }
+
     if (const XMLNode *music_node = root->getNode("music"))
     {
         std::string title_music;
diff --git a/src/config/stk_config.hpp b/src/config/stk_config.hpp
index 5cf2624d8..b9cf4542a 100644
--- a/src/config/stk_config.hpp
+++ b/src/config/stk_config.hpp
@@ -103,6 +103,12 @@ public:
                                          before it is ignored. */
     bool  m_enable_networking;
 
+    /** Disable steering if skidding is stopped. This can help in making 
+     *  skidding more controllable (since otherwise when trying to steer while
+     *  steering is reset to match the graphics it often results in the kart
+     *  crashing). */
+    bool m_disable_steer_while_unskid;
+
     float m_ai_acceleration;         /**<Between 0 and 1, default being 1, can be
                                          used to give a handicap to AIs */
     
diff --git a/src/graphics/camera.cpp b/src/graphics/camera.cpp
index 24aaa95c0..189202627 100644
--- a/src/graphics/camera.cpp
+++ b/src/graphics/camera.cpp
@@ -411,7 +411,7 @@ void Camera::getCameraSettings(float *above_kart, float *cam_angle,
         break;
     }
 
-}   // get CameraPosition
+}   // getCameraSettings
 
 //-----------------------------------------------------------------------------
 /** Called once per time frame to move the camera to the right position.
diff --git a/src/karts/controller/player_controller.cpp b/src/karts/controller/player_controller.cpp
index fc2c3edfa..59a49a559 100644
--- a/src/karts/controller/player_controller.cpp
+++ b/src/karts/controller/player_controller.cpp
@@ -22,6 +22,7 @@
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
 #include "config/player.hpp"
+#include "config/stk_config.hpp"
 #include "graphics/camera.hpp"
 #include "graphics/irr_driver.hpp"
 #include "input/input_manager.hpp"
@@ -30,6 +31,7 @@
 #include "items/powerup.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/kart_properties.hpp"
+#include "karts/skidding.hpp"
 #include "karts/rescue_animation.hpp"
 #include "modes/world.hpp"
 #include "race/history.hpp"
@@ -228,6 +230,13 @@ void PlayerController::steer(float dt, int steer_val)
         gui_base->addMessage(StringUtils::insertValues(L"steer_val %i", steer_val), m_kart, 1.0f,
                              video::SColor(255, 255, 0, 255), false);
     }
+
+    if(stk_config->m_disable_steer_while_unskid &&
+       !m_controls->m_skid &&
+       m_kart->getSkidding()->getVisualSkidRotation()!=0)
+    {
+        m_controls->m_steer = 0;
+    }
     const float STEER_CHANGE = dt/m_kart->getTimeFullSteer();  // amount the steering is changed
     if (steer_val < 0)
     {