diff --git a/Assets/NaughtyAttributes/Scripts/Editor/NaughtyInspector.cs b/Assets/NaughtyAttributes/Scripts/Editor/NaughtyInspector.cs
index cce935b4..3d5a05e9 100644
--- a/Assets/NaughtyAttributes/Scripts/Editor/NaughtyInspector.cs
+++ b/Assets/NaughtyAttributes/Scripts/Editor/NaughtyInspector.cs
@@ -34,6 +34,15 @@ protected virtual void OnDisable()
         }
 
         public override void OnInspectorGUI()
+        {
+            DrawFields();
+
+            DrawNonSerializedFields();
+            DrawNativeProperties();
+            DrawButtons();
+        }
+
+        protected virtual void DrawFields()
         {
             GetSerializedProperties(ref _serializedProperties);
 
@@ -46,10 +55,6 @@ public override void OnInspectorGUI()
             {
                 DrawSerializedProperties();
             }
-
-            DrawNonSerializedFields();
-            DrawNativeProperties();
-            DrawButtons();
         }
 
         protected void GetSerializedProperties(ref List<SerializedProperty> outSerializedProperties)