diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp
index 9d30152d64..1451f53756 100644
--- a/src/openrct2-ui/interface/Widget.cpp
+++ b/src/openrct2-ui/interface/Widget.cpp
@@ -49,9 +49,6 @@ void WidgetDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetInd
 {
     switch (w->widgets[widgetIndex].type)
     {
-        case WindowWidgetType::Empty:
-        case WindowWidgetType::Last:
-            break;
         case WindowWidgetType::Frame:
             WidgetFrameDraw(dpi, w, widgetIndex);
             break;
@@ -99,11 +96,11 @@ void WidgetDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetInd
         case WindowWidgetType::Checkbox:
             WidgetCheckboxDraw(dpi, w, widgetIndex);
             break;
-        case WindowWidgetType::Placeholder:
-            break;
         case WindowWidgetType::TextBox:
             WidgetTextBoxDraw(dpi, w, widgetIndex);
             break;
+        default:
+            break;
     }
 }
 
diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp
index 1c47819df1..685994b1f8 100644
--- a/src/openrct2-ui/scripting/CustomWindow.cpp
+++ b/src/openrct2-ui/scripting/CustomWindow.cpp
@@ -385,7 +385,7 @@ namespace OpenRCT2::Ui::Windows
     static void InvokeEventHandler(
         const std::shared_ptr<Plugin>& owner, const DukValue& dukHandler, const std::vector<DukValue>& args);
 
-    class CustomWindow : public Window
+    class CustomWindow final : public Window
     {
     private:
         static rct_windownumber _nextWindowNumber;
@@ -694,7 +694,7 @@ namespace OpenRCT2::Ui::Windows
             }
         }
 
-        void OnTextInput(rct_widgetindex widgetIndex, std::string_view text)
+        void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
         {
             auto& info = GetInfo(this);
             auto widgetDesc = info.GetCustomWidgetDesc(this, widgetIndex);
diff --git a/src/openrct2-ui/scripting/ScWidget.hpp b/src/openrct2-ui/scripting/ScWidget.hpp
index 48ff3ef17f..5b443c0aa5 100644
--- a/src/openrct2-ui/scripting/ScWidget.hpp
+++ b/src/openrct2-ui/scripting/ScWidget.hpp
@@ -111,6 +111,8 @@ namespace OpenRCT2::Scripting
                         return "empty";
                     case WindowWidgetType::Placeholder:
                         return "placeholder";
+                    case WindowWidgetType::Custom:
+                        return "custom";
                     case WindowWidgetType::Last:
                         return "last";
                 }