diff --git a/java/res/xml/popup_punctuation.xml b/java/res/xml/popup_punctuation.xml
index a29fb520d..7f88cd3e0 100644
--- a/java/res/xml/popup_punctuation.xml
+++ b/java/res/xml/popup_punctuation.xml
@@ -36,11 +36,11 @@
     </Row>
     <Row android:rowEdgeFlags="bottom">
         <Key android:keyLabel=";" android:keyEdgeFlags="left" />
-        <Key android:keyLabel="," />
         <Key android:keyLabel="\@" />
         <Key android:keyLabel="\'" />
         <Key android:keyLabel="&quot;" />
         <Key android:keyLabel="\?" />
-        <Key android:keyLabel="!" android:keyEdgeFlags="right" />
+        <Key android:keyLabel="!" />
+        <Key android:keyLabel="," android:keyEdgeFlags="right" />
     </Row>
 </Keyboard>