diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardLayoutSet.java b/app/src/main/java/helium314/keyboard/keyboard/KeyboardLayoutSet.java
index 0a3bcc041..5f62e9dec 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/KeyboardLayoutSet.java
+++ b/app/src/main/java/helium314/keyboard/keyboard/KeyboardLayoutSet.java
@@ -218,9 +218,8 @@ public final class KeyboardLayoutSet {
         public static KeyboardLayoutSet buildEmojiClipBottomRow(final Context context, @Nullable final EditorInfo ei) {
             final Builder builder = new Builder(context, ei);
             builder.mParams.mMode = KeyboardId.MODE_TEXT;
-            // always full width, but height should consider scale and number row to align nicely
+            final int width = ResourceUtils.getKeyboardWidth(context, Settings.getInstance().getCurrent());
             // actually the keyboard does not have full height, but at this point we use it to get correct key heights
-            final int width = ResourceUtils.getDefaultKeyboardWidth(context);
             final int height = ResourceUtils.getKeyboardHeight(context.getResources(), Settings.getInstance().getCurrent());
             builder.setKeyboardGeometry(width, height);
             builder.setSubtype(RichInputMethodManager.getInstance().getCurrentSubtype());