diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 9d4bd1282c..56b044dcd5 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -792,7 +792,7 @@ namespace MWGui
 
         int incr = next ? 1 : -1;
         bool found = false;
-        const ESM::RefId* lastId = nullptr;
+        const ESM::RefId* lastId = &ESM::RefId::sEmpty;
         if (selected != -1)
             lastId = &model.getItem(selected).mBase.getCellRef().getRefId();
         ItemModel::ModelIndex cycled = selected;
diff --git a/components/esm3/savedgame.cpp b/components/esm3/savedgame.cpp
index 09620258bc..525a873643 100644
--- a/components/esm3/savedgame.cpp
+++ b/components/esm3/savedgame.cpp
@@ -6,7 +6,7 @@
 namespace ESM
 {
 
-    int SavedGame::sCurrentFormat = 21;
+    int SavedGame::sCurrentFormat = 22;
 
     void SavedGame::load(ESMReader& esm)
     {