diff --git a/core/internal/server/wayland/manager.go b/core/internal/server/wayland/manager.go
index aa4e75a75..766162799 100644
--- a/core/internal/server/wayland/manager.go
+++ b/core/internal/server/wayland/manager.go
@@ -539,14 +539,10 @@ func (m *Manager) addOutputControl(output *wlclient.Output) error {
 }
 
 func (m *Manager) recreateOutputControl(out *outputState) error {
-	m.configMutex.RLock()
-	enabled := m.config.Enabled
-	m.configMutex.RUnlock()
-
 	switch {
 	case m.connectionDead.Load():
 		return nil
-	case !enabled || !m.controlsInitialized:
+	case !m.needsControls() || !m.controlsInitialized:
 		return nil
 	case out.isVirtual:
 		return nil
diff --git a/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml b/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml
index 0d99dd3b1..5de64b629 100644
--- a/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml
+++ b/quickshell/Modules/Settings/DisplayConfig/OutputCard.qml
@@ -530,7 +530,7 @@ StyledRect {
             }
 
             Column {
-                width: parent.width - 18 - Theme.spacingS - tempLabel.width - Theme.spacingS
+                width: parent.width - 18 - Theme.spacingS - tempLabel.width - Theme.spacingS - (tempResetButton.visible ? tempResetButton.width + Theme.spacingS : 0)
                 spacing: 1
                 anchors.verticalCenter: parent.verticalCenter
 
@@ -557,9 +557,17 @@ StyledRect {
                 anchors.verticalCenter: parent.verticalCenter
             }
 
-            Item {
-                width: 1
-                height: 1
+            DankButton {
+                id: tempResetButton
+                text: ""
+                iconName: "close"
+                buttonHeight: 30
+                horizontalPadding: Theme.spacingXS
+                backgroundColor: "transparent"
+                textColor: Theme.error
+                visible: colorTempRow.currentTemp !== 0
+                anchors.verticalCenter: parent.verticalCenter
+                onClicked: ICCService.setOutputTemp(root.outputName, 0)
             }
         }