diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 964f6c6ec7..ed8bce768d 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -32,6 +32,14 @@
 						  android:layout_width="match_parent"
 						  android:layout_height="wrap_content"/>
 
+			<fragment
+					xmlns:android="http://schemas.android.com/apk/res/android"
+					android:id="@+id/ErrorFragment"
+					android:name="net.osmand.plus.dashboard.DashErrorFragment"
+					android:layout_marginTop="@dimen/dashCardMargin"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
 					android:id="@+id/SearchFragment"
@@ -91,7 +99,7 @@
 
 		<!--To make sure that floating button is always visible-->
 	<View	android:layout_width="match_parent"
-			android:layout_height="76dp"
+			android:layout_height="@dimen/dashFABMargin"
 			android:orientation="vertical"/>
 
     </LinearLayout>
diff --git a/OsmAnd/res/values-v14/sizes.xml b/OsmAnd/res/values-v14/sizes.xml
new file mode 100644
index 0000000000..c51ebce194
--- /dev/null
+++ b/OsmAnd/res/values-v14/sizes.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dashFABMargin">76dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index e3ccc0a847..5ed26bb1fc 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -20,6 +20,7 @@
     <dimen name="dashAboutTextSize">20sp</dimen>
     <dimen name="dashCardMargin">4dp</dimen>
 	<dimen name="abp__shadow_height">4dp</dimen>
+    <dimen name="dashFABMargin">0dp</dimen>
 
     <!-- TextSizes -->
     <dimen name="showAllButtonTextSize">12sp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index 49846dfbfe..f1f289ff1c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -94,10 +94,14 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 			if (headerHeight < t - margin){
 				//hiding action bar - showing floating button
 				//getSupportActionBar().hide();
-				fabButton.showFloatingActionButton();
+				if (fabButton != null) {
+					fabButton.showFloatingActionButton();
+				}
 			} else {
 				//getSupportActionBar().show();
-				fabButton.hideFloatingActionButton();
+				if (fabButton != null) {
+					fabButton.hideFloatingActionButton();
+				}
 
 				//makes other cards to move on top of the map card to make it look like android animations
 				View fragments = findViewById(R.id.fragments);
@@ -189,8 +193,9 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca
 					startMapActivity();
 				}
 			});
+			fabButton.hideFloatingActionButton();
 		}
-		fabButton.hideFloatingActionButton();
+
 		getLocationProvider().addCompassListener(this);
 		getLocationProvider().registerOrUnregisterCompassListener(true);