diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp
index 99cbd98db4..6f64da72e7 100644
--- a/apps/opencs/model/prefs/state.cpp
+++ b/apps/opencs/model/prefs/state.cpp
@@ -242,6 +242,8 @@ void CSMPrefs::State::declare()
         addValues (landeditOutsideCell);
     declareEnum ("outside-visible-landedit", "Handling land edit outside of visible cells", showAndLandEdit).
         addValues (landeditOutsideVisibleCell);
+    declareInt ("texturebrush-maximumsize", "Maximum texture brush size", 50).
+        setMin (1);
 
     declareCategory ("Key Bindings");
 
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.cpp b/apps/opencs/view/widget/scenetooltexturebrush.cpp
index 003ab12fd1..76727a7a97 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.cpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp
@@ -21,7 +21,9 @@
 #include <QSizePolicy>
 
 #include "scenetool.hpp"
+
 #include "../../model/doc/document.hpp"
+#include "../../model/prefs/state.hpp"
 #include "../../model/world/data.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/landtexture.hpp"
@@ -33,11 +35,11 @@ CSVWidget::BrushSizeControls::BrushSizeControls(const QString &title, QWidget *p
     mBrushSizeSlider = new QSlider(Qt::Horizontal);
     mBrushSizeSlider->setTickPosition(QSlider::TicksBothSides);
     mBrushSizeSlider->setTickInterval(10);
-    mBrushSizeSlider->setRange(1, 50);
+    mBrushSizeSlider->setRange(1, CSMPrefs::get()["3D Scene Editing"]["texturebrush-maximumsize"].toInt());
     mBrushSizeSlider->setSingleStep(1);
 
     mBrushSizeSpinBox = new QSpinBox;
-    mBrushSizeSpinBox->setRange(1, 50);
+    mBrushSizeSpinBox->setRange(1, CSMPrefs::get()["3D Scene Editing"]["texturebrush-maximumsize"].toInt());
     mBrushSizeSpinBox->setSingleStep(1);
 
     mLayoutSliderSize = new QHBoxLayout;
@@ -273,6 +275,8 @@ void CSVWidget::SceneToolTextureBrush::clicked (const QModelIndex& index)
 void CSVWidget::SceneToolTextureBrush::activate ()
 {
     QPoint position = QCursor::pos();
+    mTextureBrushWindow->mSizeSliders->mBrushSizeSlider->setRange(1, CSMPrefs::get()["3D Scene Editing"]["texturebrush-maximumsize"].toInt());
+    mTextureBrushWindow->mSizeSliders->mBrushSizeSpinBox->setRange(1, CSMPrefs::get()["3D Scene Editing"]["texturebrush-maximumsize"].toInt());
     mTextureBrushWindow->move (position);
     mTextureBrushWindow->show();
 }
diff --git a/apps/opencs/view/widget/scenetooltexturebrush.hpp b/apps/opencs/view/widget/scenetooltexturebrush.hpp
index 1c0e0a334c..33a6dc2de8 100644
--- a/apps/opencs/view/widget/scenetooltexturebrush.hpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.hpp
@@ -30,9 +30,9 @@ namespace CSVWidget
         public:
             BrushSizeControls(const QString &title, QWidget *parent);
             QSlider *mBrushSizeSlider;
+            QSpinBox *mBrushSizeSpinBox;
 
         private:
-            QSpinBox *mBrushSizeSpinBox;
             QHBoxLayout *mLayoutSliderSize;
     };