diff --git a/common/unicode-bidi.cpp b/common/unicode-bidi.cpp
index 340a0720762..7e18fa0c3b1 100644
--- a/common/unicode-bidi.cpp
+++ b/common/unicode-bidi.cpp
@@ -132,10 +132,13 @@ String convertBiDiStringByLines(const String &input, const Common::CodePage page
 }
 
 String convertBiDiString(const String &input, const Common::Language lang, BiDiParagraph dir) {
-	if (lang != Common::HE_ISR)		//TODO: modify when we'll support other RTL languages, such as Arabic and Farsi
+	if (lang == Common::HE_ISR) {
+		return Common::convertBiDiString(input, kWindows1255, dir);
+	} else if (lang == Common::FA_IRN) {
+		return Common::convertBiDiString(input, kWindows1256, dir);
+	} else {
 		return input;
-
-	return Common::convertBiDiString(input, kWindows1255, dir);
+	}
 }
 
 String convertBiDiString(const String &input, const Common::CodePage page, BiDiParagraph dir) {