diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml
index c77627e59..dab7f907e 100644
--- a/java/res/xml-sw600dp/rows_greek.xml
+++ b/java/res/xml-sw600dp/rows_greek.xml
@@ -27,7 +27,10 @@
         latin:keyWidth="9.0%p"
     >
         <Key
-            latin:keyLabel=";" />
+            latin:keyLabel=";"
+            latin:keyHintLabel=":"
+            latin:moreKeys=":"
+            latin:keyStyle="hasShiftedLetterHintStyle" />
         <!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
         <!--
         <switch>
diff --git a/java/res/xml-sw768dp/rows_greek.xml b/java/res/xml-sw768dp/rows_greek.xml
index e9a76a588..7c9072410 100644
--- a/java/res/xml-sw768dp/rows_greek.xml
+++ b/java/res/xml-sw768dp/rows_greek.xml
@@ -31,7 +31,10 @@
             latin:keyLabelFlags="alignLeft"
             latin:keyWidth="7.969%p" />
         <Key
-            latin:keyLabel=";" />
+            latin:keyLabel=";"
+            latin:keyHintLabel=":"
+            latin:moreKeys=":"
+            latin:keyStyle="hasShiftedLetterHintStyle" />
         <!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
         <!--
         <switch>
diff --git a/java/res/xml/rows_greek.xml b/java/res/xml/rows_greek.xml
index 1602c507e..24b5c1838 100644
--- a/java/res/xml/rows_greek.xml
+++ b/java/res/xml/rows_greek.xml
@@ -26,10 +26,24 @@
     <Row
         latin:keyWidth="10%p"
     >
-        <Key
-            latin:keyLabel=";"
-            latin:keyHintLabel="1"
-            latin:additionalMoreKeys="1" />
+        <switch>
+            <case
+                latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+            >
+                <Key
+                    latin:keyLabel=":"
+                    latin:keyHintLabel="1"
+                    latin:moreKeys=";"
+                    latin:additionalMoreKeys="1" />
+            </case>
+            <default>
+                <Key
+                    latin:keyLabel=";"
+                    latin:keyHintLabel="1"
+                    latin:moreKeys=":"
+                    latin:additionalMoreKeys="1" />
+            </default>
+        </switch>
         <!-- TODO: Should find a way to compound Greek dialytika tonos and other Greek letters. -->
         <!--
         <switch>