diff --git a/telldus-gui/Plugins/Sensors/__init__.js b/telldus-gui/Plugins/Sensors/__init__.js
index b2a36c73..5012dba4 100644
--- a/telldus-gui/Plugins/Sensors/__init__.js
+++ b/telldus-gui/Plugins/Sensors/__init__.js
@@ -36,6 +36,14 @@ com.telldus.sensors = function() {
 		});
 
 		view.setProperty('sensorModel', sensorList);
+		var initialViewMode = 'EDIT';
+		for (var i=0; i < sensorList.length; ++i) {
+			if (sensorList.get(i).showInList || sensorList.get(i).name !== "") {
+				initialViewMode = 'VIEW';
+				break;
+			}
+		}
+		view.setProperty('initialViewMode', initialViewMode);
 		saveSensorModel();
 		view.load("main.qml");
 		application.addWidget("sensors.gui", "icon.png", view);
diff --git a/telldus-gui/Plugins/Sensors/main.qml b/telldus-gui/Plugins/Sensors/main.qml
index 41ecb0ac..c4710d0a 100644
--- a/telldus-gui/Plugins/Sensors/main.qml
+++ b/telldus-gui/Plugins/Sensors/main.qml
@@ -3,7 +3,7 @@ import QtDesktop 0.1
 
 Item {
 	id: main
-	state: "VIEW"
+	state: initialViewMode
 
 	ScrollArea {
 		id: scrollArea