diff --git a/app/languages/definitions/Greek.yml b/app/languages/definitions/Greek.yml
index 02979f78..e328a107 100644
--- a/app/languages/definitions/Greek.yml
+++ b/app/languages/definitions/Greek.yml
@@ -2,7 +2,7 @@ locale: el-GR
 dictionaryFile: gr-utf8.csv
 layout:
   - [SPECIAL] # 0
-  - [PUNCTUATION_FR] # 1
+  - [PUNCTUATION_GR] # 1
   - [α, β, γ, ά] # 2
   - [δ, ε, ζ, έ] # 3
   - [η, θ, ι, ή, ί, ϊ, ΐ] # 4
diff --git a/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java b/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
index f5de34b5..510b70c5 100644
--- a/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
+++ b/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
@@ -74,8 +74,9 @@ public class NaturalLanguage extends Language implements Comparable<NaturalLangu
 		final String SPECIAL_CHARS_PLACEHOLDER = "SPECIAL";
 		final String PUNCTUATION_PLACEHOLDER = "PUNCTUATION";
 		final String ARABIC_PUNCTUATION_STYLE = PUNCTUATION_PLACEHOLDER + "_AR";
-		final String GERMAN_PUNCTUATION_STYLE = PUNCTUATION_PLACEHOLDER + "_DE";
 		final String FRENCH_PUNCTUATION_STYLE = PUNCTUATION_PLACEHOLDER + "_FR";
+		final String GERMAN_PUNCTUATION_STYLE = PUNCTUATION_PLACEHOLDER + "_DE";
+		final String GREEK_PUNCTUATION_STYLE = PUNCTUATION_PLACEHOLDER + "_GR";
 
 		ArrayList<String> keyChars = new ArrayList<>();
 		for (String defChar : definitionChars) {
@@ -89,11 +90,14 @@ public class NaturalLanguage extends Language implements Comparable<NaturalLangu
 				case ARABIC_PUNCTUATION_STYLE:
 					keyChars.addAll(Characters.PunctuationArabic);
 					break;
+				case FRENCH_PUNCTUATION_STYLE:
+					keyChars.addAll(Characters.PunctuationFrench);
+					break;
 				case GERMAN_PUNCTUATION_STYLE:
 					keyChars.addAll(Characters.PunctuationGerman);
 					break;
-				case FRENCH_PUNCTUATION_STYLE:
-					keyChars.addAll(Characters.PunctuationFrench);
+				case GREEK_PUNCTUATION_STYLE:
+					keyChars.addAll(Characters.PunctuationGreek);
 					break;
 				default:
 					keyChars.add(defChar);
diff --git a/app/src/main/java/io/github/sspanak/tt9/util/Characters.java b/app/src/main/java/io/github/sspanak/tt9/util/Characters.java
index 3ea41419..9232415a 100644
--- a/app/src/main/java/io/github/sspanak/tt9/util/Characters.java
+++ b/app/src/main/java/io/github/sspanak/tt9/util/Characters.java
@@ -27,6 +27,10 @@ public class Characters {
 		",", ".", "-", "„", "“", "(", ")", "[", "]", "&", "§", "~", "\"", "`", "'", ";", ":", "!", "?"
 	));
 
+	final public static ArrayList<String> PunctuationGreek = new ArrayList<>(Arrays.asList(
+		",", ".", "-", "«", "»", "(", ")", "[", "]", "&", "§", "~", "\"", "`", "'", "·", ":", "!", ";"
+	));
+
 	final public static ArrayList<String> Currency = new ArrayList<>(Arrays.asList(
 		"$", "€", "₹", "₿", "₩", "¢", "¤", "₺", "₱", "¥", "₽", "£"
 	));