diff --git a/android/res/layout/fragment_updater.xml b/android/res/layout/fragment_updater.xml
index 22a42164fa..5180427e2a 100644
--- a/android/res/layout/fragment_updater.xml
+++ b/android/res/layout/fragment_updater.xml
@@ -70,14 +70,16 @@
     </FrameLayout>
     <TextView
       android:id="@+id/cancel_btn"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/height_block_base"
       android:layout_marginLeft="@dimen/margin_base"
       android:layout_marginRight="@dimen/margin_base"
       android:layout_marginBottom="@dimen/margin_base"
       android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
       android:textColor="?buttonDialogTextColor"
       android:layout_gravity="center_horizontal"
+      android:gravity="center"
+      android:background="?clickableBackground"
       tools:text="Manually update later"/>
   </LinearLayout>
 
diff --git a/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java b/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
index 96a071a3c5..4a97352b75 100644
--- a/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
+++ b/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java
@@ -19,6 +19,7 @@ import com.mapswithme.maps.base.BaseMwmDialogFragment;
 import com.mapswithme.util.Constants;
 import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
+import com.mapswithme.util.Utils;
 import com.mapswithme.util.statistics.Statistics;
 
 import java.util.List;
@@ -80,8 +81,18 @@ public class UpdaterDialogFragment extends BaseMwmDialogFragment
               text = String.valueOf(item.errorCode);
           }
           Statistics.INSTANCE.trackDownloaderDialogError(mTotalSizeMb, text);
-          MapManager.showError(getActivity(), item, null);
-          dismiss();
+          MapManager.showError(getActivity(), item, new Utils.Proc<Boolean>()
+          {
+            @Override
+            public void invoke(@NonNull Boolean param)
+            {
+              if (param)
+                MapManager.nativeUpdate(CountryItem.getRootId());
+              else
+                dismiss();
+            }
+          });
+
           return;
         }
       }