diff --git a/res/layout/color_preference_items.xml b/res/layout/color_preference_items.xml
index db1a7f8d93..ff7b3b1754 100644
--- a/res/layout/color_preference_items.xml
+++ b/res/layout/color_preference_items.xml
@@ -11,11 +11,21 @@
   limitations under the License.
   -->
 
-<android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                      xmlns:app="http://schemas.android.com/apk/res-auto"
-                                      android:id="@+id/color_grid"
-                                      android:padding="16dp"
-                                      android:layout_width="wrap_content"
-                                      android:layout_height="wrap_content"
-                                      app:orientation="horizontal"
-                                      app:columnCount="5"/>
\ No newline at end of file
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:layout_gravity="center"
+             android:gravity="center">
+
+    <android.support.v7.widget.GridLayout
+            android:id="@+id/color_grid"
+            android:padding="16dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            app:orientation="horizontal"
+            app:columnCount="5"/>
+</FrameLayout>
+
diff --git a/src/org/thoughtcrime/securesms/preferences/ColorPreference.java b/src/org/thoughtcrime/securesms/preferences/ColorPreference.java
index 4a89a52adc..219908125f 100644
--- a/src/org/thoughtcrime/securesms/preferences/ColorPreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/ColorPreference.java
@@ -223,31 +223,31 @@ public class ColorPreference extends Preference {
     }
 
     private void sizeDialog() {
-      if (mPreference == null || mColorGrid == null) {
-        return;
-      }
-
-      Dialog dialog = getDialog();
-      if (dialog == null) {
-        return;
-      }
-
-      final Resources res = mColorGrid.getContext().getResources();
-      DisplayMetrics dm = res.getDisplayMetrics();
-
-      // Can't use Integer.MAX_VALUE here (weird issue observed otherwise on 4.2)
-      mColorGrid.measure(
-          View.MeasureSpec.makeMeasureSpec(dm.widthPixels, View.MeasureSpec.AT_MOST),
-          View.MeasureSpec.makeMeasureSpec(dm.heightPixels, View.MeasureSpec.AT_MOST));
-      int width = mColorGrid.getMeasuredWidth();
-      int height = mColorGrid.getMeasuredHeight();
-
-      int extraPadding = res.getDimensionPixelSize(R.dimen.color_grid_extra_padding);
-
-      width += extraPadding;
-      height += extraPadding;
-
-      dialog.getWindow().setLayout(width, height);
+//      if (mPreference == null || mColorGrid == null) {
+//        return;
+//      }
+//
+//      Dialog dialog = getDialog();
+//      if (dialog == null) {
+//        return;
+//      }
+//
+//      final Resources res = mColorGrid.getContext().getResources();
+//      DisplayMetrics dm = res.getDisplayMetrics();
+//
+//      // Can't use Integer.MAX_VALUE here (weird issue observed otherwise on 4.2)
+//      mColorGrid.measure(
+//          View.MeasureSpec.makeMeasureSpec(dm.widthPixels, View.MeasureSpec.AT_MOST),
+//          View.MeasureSpec.makeMeasureSpec(dm.heightPixels, View.MeasureSpec.AT_MOST));
+//      int width = mColorGrid.getMeasuredWidth();
+//      int height = mColorGrid.getMeasuredHeight();
+//
+//      int extraPadding = res.getDimensionPixelSize(R.dimen.color_grid_extra_padding);
+//
+//      width += extraPadding;
+//      height += extraPadding;
+//
+//      dialog.getWindow().setLayout(width, height);
     }
   }