diff --git a/src/scanpopup.cc b/src/scanpopup.cc
index e7cd2d13..6ec79f28 100644
--- a/src/scanpopup.cc
+++ b/src/scanpopup.cc
@@ -136,7 +136,7 @@ void ScanPopup::handleInputWord( QString const & str )
        !checkModifiersPressed( cfg.preferences.scanPopupModifiers ) )
     return;
 
-  inputWord = str.trimmed();
+  inputWord = QString::fromStdWString( Folding::trimWhitespaceOrPunct( str.toStdWString() ) );
 
   if ( !inputWord.size() )
     return;