diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdf32b7..5990efc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,6 +148,8 @@ add_executable(smartvos
         src/ui/itemsettingsdialog.cpp
         src/ui/actorsettingsdialog.h
         src/ui/actorsettingsdialog.cpp
+        src/ui/sensorsettingsdialog.h
+        src/ui/sensorsettingsdialog.cpp
 
         src/ui/actorwidgets/factoractorwidget.h
         src/ui/actorwidgets/factoractorwidget.cpp
@@ -181,6 +183,7 @@ target_sources(smartvos
         src/ui/itemcreationdialog.ui
         src/ui/itemsettingsdialog.ui
         src/ui/actorsettingsdialog.ui
+        src/ui/sensorsettingsdialog.ui
         src/ui/actorwidgets/factoractorwidget.ui
         src/ui/actorwidgets/polynomalactorwidget.ui
         src/ui/actorwidgets/sensoractorwidget.ui
diff --git a/src/ui/sensorlistwidget.cpp b/src/ui/sensorlistwidget.cpp
index b732362..ce87271 100644
--- a/src/ui/sensorlistwidget.cpp
+++ b/src/ui/sensorlistwidget.cpp
@@ -4,6 +4,8 @@
 #include <QHeaderView>
 #include <QScroller>
 
+#include "sensorsettingsdialog.h"
+
 SensorListWidget::SensorListWidget(const bool showHidden, QWidget *parent): QTableWidget(parent),
 	showHidden_(showHidden)
 {
@@ -15,12 +17,31 @@ SensorListWidget::SensorListWidget(const bool showHidden, QWidget *parent): QTab
 	setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
 	sensorsChanged(std::vector<Sensor>());
 	verticalHeader()->hide();
+
+	connect(this, &QTableWidget::doubleClicked, this, &SensorListWidget::onDoubleClick);
 }
 
 SensorListWidget::SensorListWidget(SensorStore& sensorStore, const bool showHidden,
                                    QWidget* parent): QTableWidget (parent), showHidden_(showHidden)
 {
 	sensorsChanged(*(sensorStore.getSensors()));
+	connect(this, &QTableWidget::doubleClicked, this, &SensorListWidget::onDoubleClick);
+}
+
+void SensorListWidget::onDoubleClick(const QModelIndex &index)
+{
+	if(index.isValid())
+	{
+		const Sensor& sensor = getSensorForIndex(index);
+		SensorSettingsDialog diag(sensor, this);
+		if(diag.exec())
+		{
+			Sensor updatedSensor = sensor;
+			updatedSensor.name = diag.getName();
+			updatedSensor.hidden = diag.getHidden();
+			globalSensors.sensorGotState(updatedSensor, SENSOR_UPDATE_USER);
+		}
+	}
 }
 
 void SensorListWidget::sensorsChanged(std::vector<Sensor> sensors)
diff --git a/src/ui/sensorlistwidget.h b/src/ui/sensorlistwidget.h
index 4c84d54..0aceabc 100644
--- a/src/ui/sensorlistwidget.h
+++ b/src/ui/sensorlistwidget.h
@@ -30,4 +30,6 @@ public slots:
 
 	void sensorsChanged(std::vector<Sensor> sensors);
 
+private slots:
+	void onDoubleClick(const QModelIndex &index);
 };
diff --git a/src/ui/sensorsettingsdialog.cpp b/src/ui/sensorsettingsdialog.cpp
new file mode 100644
index 0000000..dda6a56
--- /dev/null
+++ b/src/ui/sensorsettingsdialog.cpp
@@ -0,0 +1,29 @@
+#include "sensorsettingsdialog.h"
+#include "ui_sensorsettingsdialog.h"
+
+SensorSettingsDialog::SensorSettingsDialog(const Sensor& sensor, QWidget* parent)
+	: QDialog(parent)
+	, ui(new Ui::SensorSettingsDialog)
+{
+	ui->setupUi(this);
+
+	ui->label_typeValue->setText(QString::number(sensor.type));
+	ui->label_idValue->setText(QString::number(sensor.id));
+	ui->lineEdit_Name->setText(sensor.name);
+	ui->checkBox_Hidden->setChecked(sensor.hidden);
+}
+
+SensorSettingsDialog::~SensorSettingsDialog()
+{
+	delete ui;
+}
+
+QString SensorSettingsDialog::getName() const
+{
+	return ui->lineEdit_Name->text();
+}
+
+bool SensorSettingsDialog::getHidden() const
+{
+	return ui->checkBox_Hidden->isChecked();
+}
\ No newline at end of file
diff --git a/src/ui/sensorsettingsdialog.h b/src/ui/sensorsettingsdialog.h
new file mode 100644
index 0000000..df796c7
--- /dev/null
+++ b/src/ui/sensorsettingsdialog.h
@@ -0,0 +1,27 @@
+#ifndef SENSORSETTINGSDIALOG_H
+#define SENSORSETTINGSDIALOG_H
+
+#include <QDialog>
+#include "sensors/sensor.h"
+
+namespace Ui
+{
+class SensorSettingsDialog;
+}
+
+class SensorSettingsDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit SensorSettingsDialog(const Sensor& sensor, QWidget* parent = nullptr);
+	~SensorSettingsDialog();
+
+	QString getName() const;
+	bool getHidden() const;
+
+private:
+	Ui::SensorSettingsDialog* ui;
+};
+
+#endif // SENSORSETTINGSDIALOG_H
\ No newline at end of file
diff --git a/src/ui/sensorsettingsdialog.ui b/src/ui/sensorsettingsdialog.ui
new file mode 100644
index 0000000..608883c
--- /dev/null
+++ b/src/ui/sensorsettingsdialog.ui
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SensorSettingsDialog</class>
+ <widget class="QDialog" name="SensorSettingsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>150</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Sensor Settings</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     </property>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_Type">
+       <property name="text">
+        <string>Type:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="label_typeValue">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_Id">
+       <property name="text">
+        <string>Id:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="label_idValue">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_Name">
+       <property name="text">
+        <string>Name:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="lineEdit_Name">
+       <property name="text">
+        <string></string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_Hidden">
+       <property name="text">
+        <string>Hidden:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QCheckBox" name="checkBox_Hidden">
+       <property name="text">
+        <string></string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SensorSettingsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>SensorSettingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
\ No newline at end of file