diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33a522df41..a5c3807928 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+### Fixed
+
+- Consider HiDPI screens when using the render picker (**@RiscadoA**).
+
 ## [v0.5.0] - 2024-12-01
 
 ### Added
diff --git a/engine/src/gizmos/plugin.cpp b/engine/src/gizmos/plugin.cpp
index 80b0c2262b..af376c51f0 100644
--- a/engine/src/gizmos/plugin.cpp
+++ b/engine/src/gizmos/plugin.cpp
@@ -242,7 +242,7 @@ void cubos::engine::gizmosPlugin(Cubos& cubos)
 
     cubos.system("do Gizmos picking")
         .after(drawToRenderPickerTag)
-        .call([](GizmosRenderer& gizmosRenderer, Gizmos& gizmos,
+        .call([](const Window& window, GizmosRenderer& gizmosRenderer, Gizmos& gizmos,
                  Query<const RenderTarget&, const RenderPicker&> renderPickers) {
             int mouseX = gizmosRenderer.lastMousePosition.x;
             int mouseY = gizmosRenderer.lastMousePosition.y;
@@ -252,6 +252,11 @@ void cubos::engine::gizmosPlugin(Cubos& cubos)
             {
                 if (target.framebuffer == nullptr)
                 {
+                    mouseX = static_cast<int>(static_cast<float>(mouseX) * static_cast<float>(target.size.x) /
+                                              static_cast<float>(window->size().x));
+                    mouseY = static_cast<int>(static_cast<float>(mouseY) * static_cast<float>(target.size.y) /
+                                              static_cast<float>(window->size().y));
+
                     auto id = picker.read(static_cast<unsigned int>(mouseX), static_cast<unsigned int>(mouseY));
                     if (id < static_cast<uint32_t>(1 << 31))
                     {
diff --git a/engine/src/tools/selection/plugin.cpp b/engine/src/tools/selection/plugin.cpp
index ea2f97b979..9ac865569d 100644
--- a/engine/src/tools/selection/plugin.cpp
+++ b/engine/src/tools/selection/plugin.cpp
@@ -33,8 +33,11 @@ void cubos::engine::selectionPlugin(Cubos& cubos)
                     // Find the render picker for the main window (nullptr framebuffer)
                     if (target.framebuffer == nullptr)
                     {
-                        uint32_t entityId = picker.read(static_cast<unsigned int>(ImGui::GetMousePos().x),
-                                                        static_cast<unsigned int>(ImGui::GetMousePos().y));
+                        uint32_t entityId =
+                            picker.read(static_cast<unsigned int>((ImGui::GetMousePos().x / ImGui::GetWindowWidth()) *
+                                                                  static_cast<float>(target.size.x)),
+                                        static_cast<unsigned int>((ImGui::GetMousePos().y / ImGui::GetWindowHeight()) *
+                                                                  static_cast<float>(target.size.y)));
 
                         if (entityId == UINT32_MAX)
                         {