diff --git a/Editor/ObjectEditor.cs b/Editor/ObjectEditor.cs
index 7bc80e4..e35ddae 100644
--- a/Editor/ObjectEditor.cs
+++ b/Editor/ObjectEditor.cs
@@ -66,15 +66,22 @@ namespace Module.Inspector.Editor
             
             var position = new Rect(0, 0, 1, 1);
             
+#if UNITY_2020_1_OR_NEWER && !UNITY_6000_1_OR_NEWER
             if (Event.current.type == EventType.Repaint)
             {
                 position = GUILayoutUtility.GetLastRect();
                 position.y -= totalHeight;
 
-                #if UNITY_2020_1_OR_NEWER
+
                 position.width = EditorGUIUtility.currentViewWidth - 22.0f;
-                #endif
             }
+#endif
+            
+#if UNITY_6000_1_OR_NEWER
+            position = GUILayoutUtility.GetLastRect();
+            position.y -= totalHeight;
+            position.width = EditorGUIUtility.currentViewWidth - 22.0f;
+#endif
 
             position.y = position.yMax + EditorGUIUtility.singleLineHeight;
             position.height = EditorGUIUtility.singleLineHeight;
diff --git a/package.json b/package.json
index 67733bb..e482979 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.module.inspector",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "displayName": "Module.Inspector",
   "description": "Custom inspector with various useful property drawers",
   "unity": "2019.2",