diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index a6905343..23cbd57a 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -116,20 +116,21 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
             viewHolder.mButton2.setEnabled(false);
         } else {
             // Allow one active download
-            boolean enabled = !mUpdaterController.hasActiveDownloads() &&
-                    Utils.canInstall(update) && !mUpdaterController.isVerifyingUpdate();
+            boolean busy = mUpdaterController.hasActiveDownloads() ||
+                    mUpdaterController.isVerifyingUpdate();
+            boolean enabled = !busy && Utils.canInstall(update);
             int persistentStatus = update.getPersistentStatus();
             if (persistentStatus == UpdateStatus.Persistent.INCOMPLETE) {
                 if (update.getFile().length() == update.getFileSize()) {
-                    setButtonAction(viewHolder.mButton1, Action.VERIFY, downloadId, enabled);
+                    setButtonAction(viewHolder.mButton1, Action.VERIFY, downloadId, !busy);
                 } else {
                     setButtonAction(viewHolder.mButton1, Action.RESUME, downloadId,
                             enabled && update.getAvailableOnline());
                 }
-                setButtonAction(viewHolder.mButton2, Action.CANCEL, downloadId, enabled);
+                setButtonAction(viewHolder.mButton2, Action.CANCEL, downloadId, !busy);
             } else if (persistentStatus == UpdateStatus.Persistent.VERIFIED) {
                 setButtonAction(viewHolder.mButton1, Action.INSTALL, downloadId, enabled);
-                setButtonAction(viewHolder.mButton2, Action.CANCEL, downloadId, enabled);
+                setButtonAction(viewHolder.mButton2, Action.CANCEL, downloadId, !busy);
             } else {
                 setButtonAction(viewHolder.mButton1, Action.DOWNLOAD, downloadId, enabled);
                 setButtonAction(viewHolder.mButton2, Action.CANCEL, downloadId, false);
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 644bab53..87e7fd53 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -85,7 +85,9 @@ public class Utils {
     }
 
     public static boolean canInstall(Update update) {
-        return update.getVersion().equalsIgnoreCase(SystemProperties.get(Constants.PROP_BUILD_VERSION));
+        return update.getTimestamp() > SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0) &&
+                update.getVersion().equalsIgnoreCase(
+                        SystemProperties.get(Constants.PROP_BUILD_VERSION));
     }
 
     public static List<UpdateDownload> parseJson(File file, boolean compatibleOnly)