diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 2a5ed69..a081c21 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -297,7 +297,7 @@
                 Key key = getKey(Key.FAVORITE, id);
                 keys.add(key);
                 currentIds.add(keyToBackupKey(key));
-                if (updateTime > in.t) {
+                if (updateTime >= in.t) {
                     byte[] blob = packFavorite(cursor);
                     writeRowToBackup(key, blob, out, data);
                 }
@@ -365,7 +365,7 @@
                 Key key = getKey(Key.SCREEN, id);
                 keys.add(key);
                 currentIds.add(keyToBackupKey(key));
-                if (updateTime > in.t) {
+                if (updateTime >= in.t) {
                     byte[] blob = packScreen(cursor);
                     writeRowToBackup(key, blob, out, data);
                 }
