diff --git a/src/gui/widgets/grid.hpp b/src/gui/widgets/grid.hpp
index 7ea0b3674a16..5ce3432093a7 100644
--- a/src/gui/widgets/grid.hpp
+++ b/src/gui/widgets/grid.hpp
@@ -409,10 +409,7 @@ class grid : public widget
 		 */
 		std::unique_ptr<widget> free_widget()
 		{
-			std::unique_ptr<widget> temp(nullptr);
-			widget_.swap(temp);
-
-			return temp;
+			return std::exchange(widget_, nullptr);
 		}
 
 	private: