diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonCancel.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonCancel.java
index b2dd9ec7d..30f06e829 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonCancel.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonCancel.java
@@ -34,6 +34,7 @@ public class ButtonCancel extends Button {
         button.setVisibility(View.GONE);
         android.widget.Button buttonDownload = activity.findViewById(R.id.download);
         buttonDownload.setText(R.string.details_download);
+        buttonDownload.setVisibility(View.VISIBLE);
         buttonDownload.setEnabled(true);
     }
 }
diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonDownload.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonDownload.java
index 8cdcaebf4..cc775779e 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonDownload.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonDownload.java
@@ -55,18 +55,21 @@ public class ButtonDownload extends Button {
     }
 
     public void checkAndDownload() {
+        button.setVisibility(View.GONE);
+        View buttonCancel = activity.findViewById(R.id.cancel);
         YalpStorePermissionManager permissionManager = new YalpStorePermissionManager(activity);
         if (app.getVersionCode() == 0 && !(activity instanceof ManualDownloadActivity)) {
             activity.startActivity(new Intent(activity, ManualDownloadActivity.class));
         } else if (permissionManager.checkPermission()) {
             Log.i(getClass().getSimpleName(), "Write permission granted");
             download();
-            View buttonCancel = activity.findViewById(R.id.cancel);
             if (null != buttonCancel) {
                 buttonCancel.setVisibility(View.VISIBLE);
             }
         } else {
             permissionManager.requestPermission();
+            button.setVisibility(View.GONE);
+            buttonCancel.setVisibility(View.VISIBLE);
         }
     }