diff --git a/telldus-gui/Plugins/Sensors/SensorList.qml b/telldus-gui/Plugins/Sensors/SensorList.qml
index 8f6635bd..ea1ed7c4 100644
--- a/telldus-gui/Plugins/Sensors/SensorList.qml
+++ b/telldus-gui/Plugins/Sensors/SensorList.qml
@@ -3,6 +3,7 @@ import QtDesktop 0.1
 
 Column {
 	id: sensorList
+	property int minimumWidth: main.state == "EDIT" ? 770 : 475
 	spacing: 1
 
 	BorderImage {
diff --git a/telldus-gui/Plugins/Sensors/main.qml b/telldus-gui/Plugins/Sensors/main.qml
index c4710d0a..75b4847f 100644
--- a/telldus-gui/Plugins/Sensors/main.qml
+++ b/telldus-gui/Plugins/Sensors/main.qml
@@ -15,7 +15,8 @@ Item {
 
 		SensorList {
 			id: sensorList
-			width: main.width-scrollArea.verticalScrollBar.width
+			property int calculatedWidth: main.width-scrollArea.verticalScrollBar.width
+			width: (calculatedWidth < minimumWidth ? minimumWidth : calculatedWidth)
 		}
 	}
 }