diff --git a/src/graphics/ui/GUI.hpp b/src/graphics/ui/GUI.hpp
index 9eb08da0..6e8b4c07 100644
--- a/src/graphics/ui/GUI.hpp
+++ b/src/graphics/ui/GUI.hpp
@@ -1,16 +1,15 @@
 #ifndef FRONTEND_GUI_GUI_HPP_
 #define FRONTEND_GUI_GUI_HPP_
 
+#include "../../delegates.h"
+
 #include <queue>
 #include <memory>
 #include <vector>
 #include <string>
 #include <glm/glm.hpp>
-#include <functional>
 #include <unordered_map>
 
-#include "../../delegates.h"
-
 class Viewport;
 class GfxContext;
 class Assets;
diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp
index 955a8ae4..b00ba80d 100644
--- a/src/logic/scripting/lua/libgui.cpp
+++ b/src/logic/scripting/lua/libgui.cpp
@@ -236,7 +236,11 @@ static bool setattr(lua_State* L, Menu* menu, const std::string& attr) {
 static bool setattr(lua_State* L, InventoryView* inventory, const std::string& attr) {
     if (attr == "inventory") {
         auto inv = scripting::level->inventories->get(lua_tointeger(L, 1));
-        inventory->bind(inv, scripting::content);
+        if (inv == nullptr) {
+            inventory->unbind();
+        } else {
+            inventory->bind(inv, scripting::content);
+        }
     }
     return false;
 }