diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92d20b13..748c35ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - Bugfix: Fixed the input font not immediately updating when zooming in/out. (#5960)
 - Bugfix: Fixed color input thinking blue is also red. (#5982)
 - Bugfix: Fixed an issue where commands would sometimes reset if Chatterino was improperly shut down. (#6011)
+- Bugfix: Fixed a thick border on Windows 11. (#5836)
 - Dev: Subscriptions to PubSub channel points redemption topics now use no auth token, making it continue to work during PubSub shutdown. (#5947)
 - Dev: Add initial experimental EventSub support. (#5837, #5895, #5897, #5904, #5910, #5903, #5915, #5916, #5930, #5935, #5932, #5943, #5952, #5953, #5968, #5973, #5974, #5980, #5981, #5985, #5990, #5992, #5993, #5996, #5995, #6000, #6001, #6002, #6003, #6005, #6007, #6010, #6008, #6012, #6013, #6015, #6017, #6027, #6028, #6035, #6036, #6040, #6041)
 - Dev: Remove unneeded platform specifier for toasts. (#5914)
diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp
index eac71d50..962fa528 100644
--- a/src/widgets/BaseWindow.cpp
+++ b/src/widgets/BaseWindow.cpp
@@ -365,7 +365,14 @@ void BaseWindow::init()
         }
 
         this->ui_.layoutBase = new BaseWidget(this);
-        this->ui_.layoutBase->setContentsMargins(1, 0, 1, 1);
+        if (isWindows11OrGreater())
+        {
+            this->ui_.layoutBase->setContentsMargins(0, 0, 0, 0);
+        }
+        else
+        {
+            this->ui_.layoutBase->setContentsMargins(1, 0, 1, 1);
+        }
         layout->addWidget(this->ui_.layoutBase);
     }
 #endif
@@ -1069,8 +1076,17 @@ void BaseWindow::drawCustomWindowFrame(QPainter &painter)
             {
                 painter.setTransform(QTransform::fromScale(1 / dpr, 1 / dpr));
             }
-            painter.fillRect(1, 1, this->realBounds_.width() - 2,
-                             this->realBounds_.height() - 2, bg);
+
+            if (isWindows11OrGreater())
+            {
+                painter.fillRect(0, 0, this->realBounds_.width() - 1,
+                                 this->realBounds_.height() - 1, bg);
+            }
+            else
+            {
+                painter.fillRect(1, 1, this->realBounds_.width() - 2,
+                                 this->realBounds_.height() - 2, bg);
+            }
         }
     }
 #endif