diff --git a/common/scintilla_tricks.cpp b/common/scintilla_tricks.cpp
index 00eefa5cac..c1caab275a 100644
--- a/common/scintilla_tricks.cpp
+++ b/common/scintilla_tricks.cpp
@@ -147,7 +147,8 @@ void SCINTILLA_TRICKS::onCharHook( wxKeyEvent& aEvent )
         else
             m_te->DeleteRange( m_te->GetSelectionStart(), 1 );
     }
-    else if( ( aEvent.GetModifiers() == wxMOD_CONTROL && aEvent.GetUnicodeKey() == '/' ) )
+    else if( aEvent.ControlDown() && !aEvent.MetaDown() && !aEvent.AltDown()
+            && aEvent.GetUnicodeKey() == '/' )
     {
         int  startLine = m_te->LineFromPosition( m_te->GetSelectionStart() );
         int  endLine = m_te->LineFromPosition( m_te->GetSelectionEnd() );