diff --git a/tools/geometryv/geometryv.cpp b/tools/geometryv/geometryv.cpp
index 40929126e..f38a0e422 100644
--- a/tools/geometryv/geometryv.cpp
+++ b/tools/geometryv/geometryv.cpp
@@ -1075,8 +1075,11 @@ int _main_(int _argc, char** _argv)
 						{
 							const int32_t itemCount = int32_t(view.m_fileList.size() );
 
-							int32_t start, end;
-							ImGui::CalcListClipping(itemCount, itemHeight, &start, &end);
+							ImGuiListClipper clipper;
+							clipper.Begin(itemCount, itemHeight);
+
+							int32_t start = clipper.DisplayStart;
+							int32_t end   = clipper.DisplayEnd;
 
 							const int32_t index = int32_t(view.m_fileIndex);
 							if (index <= start)
@@ -1088,9 +1091,6 @@ int _main_(int _argc, char** _argv)
 								ImGui::SetScrollY(ImGui::GetScrollY() + (index-end+1)*itemHeight);
 							}
 
-							ImGuiListClipper clipper;
-							clipper.Begin(itemCount, itemHeight);
-
 							while (clipper.Step() )
 							{
 								for (int32_t pos = clipper.DisplayStart; pos < clipper.DisplayEnd; ++pos)
diff --git a/tools/texturev/texturev.cpp b/tools/texturev/texturev.cpp
index c4043273e..12e257b6a 100644
--- a/tools/texturev/texturev.cpp
+++ b/tools/texturev/texturev.cpp
@@ -1861,8 +1861,11 @@ int _main_(int _argc, char** _argv)
 						{
 							const int32_t itemCount = int32_t(view.m_fileList.size() );
 
-							int32_t start, end;
-							ImGui::CalcListClipping(itemCount, itemHeight, &start, &end);
+							ImGuiListClipper clipper;
+							clipper.Begin(itemCount, itemHeight);
+
+							int32_t start = clipper.DisplayStart;
+							int32_t end   = clipper.DisplayEnd;
 
 							const int32_t index = int32_t(view.m_fileIndex);
 							if (index <= start)
@@ -1874,9 +1877,6 @@ int _main_(int _argc, char** _argv)
 								ImGui::SetScrollY(ImGui::GetScrollY() + (index-end+1)*itemHeight);
 							}
 
-							ImGuiListClipper clipper;
-							clipper.Begin(itemCount, itemHeight);
-
 							while (clipper.Step() )
 							{
 								for (int32_t pos = clipper.DisplayStart; pos < clipper.DisplayEnd; ++pos)