diff --git a/AltWidget/Providers/ActiveAppsTimelineProvider.swift b/AltWidget/Providers/ActiveAppsTimelineProvider.swift
index 7bbf3178..465222ae 100644
--- a/AltWidget/Providers/ActiveAppsTimelineProvider.swift
+++ b/AltWidget/Providers/ActiveAppsTimelineProvider.swift
@@ -41,49 +41,39 @@ class ActiveAppsTimelineProvider<T:  WidgetInfo>: AppsTimelineProviderBase<Widge
         apps = getSimulatedData(apps: apps)
         #endif
         
-        // always first page since this is never updated
+        // always start with first page since defaultDataHolder is never updated
         var currentPageApps = defaultDataHolder.currentPage(inItems: apps)
-
-        guard let widgetInfo = context,
-              let widgetID = widgetInfo.ID else
-        {
-            return currentPageApps
-        }
         
-        let navEvent = getPageInfo(widgetID: widgetID)
-        guard var navEvent = navEvent,
-              let direction = navEvent.direction else
-        {
-            // when widget is edited for new ID than the current,
-            // buttons were never triggered for this ID,
-            // hence nav-event or direction wasn't set yet
-            updatePageInfo(
-                widgetID: widgetID,
-                navEvent: NavigationEvent(direction: nil, consumed: true, dataHolder: PaginationDataHolder(other: defaultDataHolder))
-            )
-            return currentPageApps
-        }
-
-        let dataHolder = navEvent.dataHolder!
-
-        // process navigation request only if event wasn't consumed yet
-        if !navEvent.consumed {
-            switch (direction){
-                case Direction.up:
-                    currentPageApps = dataHolder.prevPage(inItems: apps, whenUnavailable: .current)!
-                case Direction.down:
-                    currentPageApps = dataHolder.nextPage(inItems: apps, whenUnavailable: .current)!
+        if  let widgetInfo = context,
+            let widgetID = widgetInfo.ID {
+            
+            var navEvent = getPageInfo(widgetID: widgetID)
+            if  let event = navEvent,
+                let direction = event.direction
+            {
+                let dataHolder = event.dataHolder!
+                currentPageApps = dataHolder.currentPage(inItems: apps)
+                
+                // process navigation request only if event wasn't consumed yet
+                if !event.consumed {
+                    switch (direction){
+                        case Direction.up:
+                            currentPageApps = dataHolder.prevPage(inItems: apps, whenUnavailable: .current)!
+                        case Direction.down:
+                            currentPageApps = dataHolder.nextPage(inItems: apps, whenUnavailable: .current)!
+                    }
+                    // mark the event as consumed
+                    // this prevents duplicate getUpdatedData() requests for same navigation event
+                    navEvent!.consumed = true
+                }
+            }else{
+                // construct fresh/replace existing
+                navEvent = NavigationEvent(direction: nil, consumed: true, dataHolder: PaginationDataHolder(other: defaultDataHolder))
             }
-            // mark the event as consumed
-            // this prevents duplicate getUpdatedData() requests for same navigation event
-            navEvent.consumed = true
-        }else{
-            // since the event was consumed, get the current page as-is for this dataholder
-            currentPageApps = dataHolder.currentPage(inItems: apps)
+            // put back the data
+            updatePageInfo(widgetID: widgetID, navEvent: navEvent)
         }
-        
-        // put back the data
-        updatePageInfo(widgetID: widgetID, navEvent: navEvent)
+             
         return currentPageApps
     }
     
diff --git a/SideStore/Utils/pagination/PaginationDataHolder.swift b/SideStore/Utils/pagination/PaginationDataHolder.swift
index 4412f289..7ca804c5 100644
--- a/SideStore/Utils/pagination/PaginationDataHolder.swift
+++ b/SideStore/Utils/pagination/PaginationDataHolder.swift
@@ -77,7 +77,13 @@ public class PaginationDataHolder {
         let count = UInt(items.count)
         
         if(count == 0) { return items }
-            
+        
+        // since we operate on any input items list at any time,
+        // we set currentPageIndex as last availablePage if out of bounds
+        let availablePages = UInt(ceil(Double(count) / Double(itemsPerPage)))
+        
+        self.currentPageindex = min(availablePages-1, currentPageindex)
+
         let startIndex = currentPageindex * itemsPerPage
         let estimatedEndIndex = startIndex + (itemsPerPage-1)
         let endIndex: UInt = min(count-1, estimatedEndIndex)