diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml
index 2468f5da8575..691f91775284 100644
--- a/WordPress/src/main/res/layout/my_site_fragment.xml
+++ b/WordPress/src/main/res/layout/my_site_fragment.xml
@@ -385,16 +385,22 @@
 
     </LinearLayout>
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:layout_marginBottom="@dimen/fab_margin"
-        android:layout_marginRight="@dimen/fab_margin"
-        android:src="@drawable/gridicon_create_light"
-        app:borderWidth="0dp"
-        app:elevation="@dimen/fab_elevation"
-        app:rippleColor="@color/fab_pressed" />
+    <!-- this coordinator is only here due to https://code.google.com/p/android/issues/detail?id=175330 -->
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/coordinator"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fab_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
+            android:layout_marginBottom="@dimen/fab_margin"
+            android:layout_marginRight="@dimen/fab_margin"
+            android:src="@drawable/gridicon_create_light"
+            app:borderWidth="0dp"
+            app:rippleColor="@color/fab_pressed" />
+    </android.support.design.widget.CoordinatorLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/WordPress/src/main/res/layout/post_list_fragment.xml b/WordPress/src/main/res/layout/post_list_fragment.xml
index 58b0e2db9441..d7e3dc901efc 100644
--- a/WordPress/src/main/res/layout/post_list_fragment.xml
+++ b/WordPress/src/main/res/layout/post_list_fragment.xml
@@ -66,7 +66,6 @@
             android:layout_marginRight="@dimen/fab_margin"
             android:src="@drawable/gridicon_create_light"
             app:borderWidth="0dp"
-            app:elevation="@dimen/fab_elevation"
             app:rippleColor="@color/fab_pressed" />
 
     </android.support.design.widget.CoordinatorLayout>