diff --git a/common/cursors.cpp b/common/cursors.cpp
index fb7a28a0ff..6e50076c8e 100644
--- a/common/cursors.cpp
+++ b/common/cursors.cpp
@@ -366,12 +366,10 @@ const wxCursor& CURSOR_STORE::Get( KICURSOR aIdKey ) const
     const auto find_iter = m_store.find( aIdKey );
 
     if( find_iter != m_store.end() )
-    {
         return find_iter->second;
-    }
 
-    wxASSERT_MSG( false,
-            wxString::Format( "Could not find cursor with ID %d", static_cast<int>( aIdKey ) ) );
+    wxASSERT_MSG( false, wxString::Format( "Could not find cursor with ID %d",
+                                           static_cast<int>( aIdKey ) ) );
     return wxNullCursor;
 }
 
diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index 1e22990f1c..3026dfb58e 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -105,6 +105,7 @@ EE_SELECTION_TOOL::EE_SELECTION_TOOL() :
         m_exclusive_or( false ),
         m_multiple( false ),
         m_skip_heuristics( false ),
+        m_nonModifiedCursor( KICURSOR::ARROW ),
         m_isSymbolEditor( false ),
         m_isLibView( false ),
         m_unit( 0 ),