diff --git a/ChangeLog b/ChangeLog
index 2bc9cb6453..e035deb2f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,8 +18,8 @@
 - Client: Added Conductor to list of instruments (#2140).
   (contributed by @henkdegroot)
 
-- Client: Fix wrong display of Unicode characters at line wrap (#1994).
-  (contributed by @djfun, @pljones)
+- Client: Fix wrong display of Unicode characters at line wrap and settings screen (#1994, #2274).
+  (contributed by @djfun, @pljones, @hoffie)
 
 - Client: Fixed incorrect operation of feedback detection on first connect in run (#2120).
   (contributed by @softins)
diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
index 8c0c9408e9..3b68d4fa27 100644
--- a/src/clientsettingsdlg.cpp
+++ b/src/clientsettingsdlg.cpp
@@ -1093,7 +1093,7 @@ void CClientSettingsDlg::OnAliasTextChanged ( const QString& strNewName )
     else
     {
         // text is too long, update control with shortened text
-        pedtAlias->setText ( strNewName.left ( MAX_LEN_FADER_TAG ) );
+        pedtAlias->setText ( TruncateString ( strNewName, MAX_LEN_FADER_TAG ) );
     }
 }
 
diff --git a/src/util.cpp b/src/util.cpp
index 1df7f01b1e..f3d105307b 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -667,7 +667,7 @@ void CLanguageComboBox::OnLanguageActivated ( int iLanguageIdx )
     }
 }
 
-static inline QString TruncateString ( QString str, int position )
+QString TruncateString ( QString str, int position )
 {
     QTextBoundaryFinder tbfString ( QTextBoundaryFinder::Grapheme, str );
 
diff --git a/src/util.h b/src/util.h
index 6072c7727c..f707e87b79 100644
--- a/src/util.h
+++ b/src/util.h
@@ -99,6 +99,9 @@ inline int CalcBitRateBitsPerSecFromCodedBytes ( const int iCeltNumCodedBytes, c
 
 QString GetVersionAndNameStr ( const bool bDisplayInGui = true );
 QString MakeClientNameTitle ( QString win, QString client );
+#ifndef HEADLESS
+QString TruncateString ( QString str, int position );
+#endif
 
 /******************************************************************************\
 * CVector Base Class                                                           *