diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 9fb102461..6263fb1dc 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1469,6 +1469,7 @@ void MainWindow::dbState(bool dirty)
 {
     ui->fileSaveAction->setEnabled(dirty);
     ui->fileRevertAction->setEnabled(dirty);
+    ui->undoAction->setEnabled(dirty);
     // Unfortunately, sqlite does not allow to backup the DB while there are pending savepoints,
     // so we cannot "Save As" when the DB is dirty.
     ui->fileSaveAsAction->setEnabled(!dirty);
@@ -1498,6 +1499,14 @@ void MainWindow::fileRevert()
     }
 }
 
+void MainWindow::undo()
+{
+    if (db.isOpen()) {
+        db.revertToSavepoint("DB4S_UNDO");
+        refreshTableBrowsers();
+    }
+}
+
 void MainWindow::exportDatabaseToSQL()
 {
     QString current_table;
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 9529631d0..34746cfe1 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -187,6 +187,7 @@ private slots:
     void exportTableToJson();
     void fileSave();
     void fileRevert();
+    void undo();
     void exportDatabaseToSQL();
     void importDatabaseFromSQL();
     void openRecentFile();
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index ec785be44..8c7b6f81c 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -183,8 +183,8 @@ You can drag SQL statements from an object row and drop them into other applicat
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>673</width>
-             <height>544</height>
+             <width>640</width>
+             <height>526</height>
             </rect>
            </property>
            <layout class="QFormLayout" name="formLayout">
@@ -753,7 +753,7 @@ You can drag SQL statements from an object row and drop them into other applicat
      <x>0</x>
      <y>0</y>
      <width>1037</width>
-     <height>23</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="fileMenu">
@@ -792,6 +792,7 @@ You can drag SQL statements from an object row and drop them into other applicat
     <addaction name="separator"/>
     <addaction name="fileSaveAction"/>
     <addaction name="fileRevertAction"/>
+    <addaction name="undoAction"/>
     <addaction name="separator"/>
     <addaction name="menuImport"/>
     <addaction name="menuExport"/>
@@ -882,6 +883,7 @@ You can drag SQL statements from an object row and drop them into other applicat
    <addaction name="separator"/>
    <addaction name="fileSaveAction"/>
    <addaction name="fileRevertAction"/>
+   <addaction name="undoAction"/>
   </widget>
   <widget class="QDockWidget" name="dockEdit">
    <property name="windowTitle">
@@ -1254,6 +1256,30 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
     <enum>QAction::NoRole</enum>
    </property>
   </action>
+  <action name="undoAction">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="icons/icons.qrc">
+     <normaloff>:/icons/undo.svg</normaloff>:/icons/undo.svg</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Undo</string>
+   </property>
+   <property name="toolTip">
+    <string>Undo last change to a cell in the browser</string>
+   </property>
+   <property name="statusTip">
+    <string>Undo last change to a cell in the browser</string>
+   </property>
+   <property name="whatsThis">
+    <string>This action is used to undo the last change performed to a cell in the database browser. Redoing is not possible.</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
+  </action>
   <action name="fileSaveAction">
    <property name="enabled">
     <bool>false</bool>
@@ -2530,6 +2556,22 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>undoAction</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>undo()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>399</x>
+     <y>299</y>
+    </hint>
+   </hints>
+  </connection>
   <connection>
    <sender>fileSaveAction</sender>
    <signal>triggered()</signal>
@@ -3903,6 +3945,7 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
   <slot>importTableFromCSV()</slot>
   <slot>exportTableToCSV()</slot>
   <slot>fileRevert()</slot>
+  <slot>undo()</slot>
   <slot>fileSave()</slot>
   <slot>deleteIndex()</slot>
   <slot>createIndex()</slot>
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index 96383cd9d..4629144ba 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -104,5 +104,6 @@
         <file alias="text_underline">text_underlined.svg</file>
         <file alias="set_to_null">textfield_delete.svg</file>
         <file alias="settings">wrench.svg</file>
+        <file>undo.svg</file>
     </qresource>
 </RCC>
diff --git a/src/icons/undo.svg b/src/icons/undo.svg
new file mode 100644
index 000000000..cae4034b8
--- /dev/null
+++ b/src/icons/undo.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	width="16" height="16" version="1.1">
+	<title>Undo</title>
+	<desc>Undo</desc>
+	<g id="undo" transform="translate(8,8)">
+		<defs>
+			<linearGradient id="undo-backing" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#eba39e" />
+				<stop offset="100%" stop-color="#d12e25" />
+			</linearGradient>
+			<linearGradient id="undo-inner" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#fcd4c4" />
+				<stop offset="100%" stop-color="#f49486" />
+			</linearGradient>
+			<linearGradient id="undo-center" x1="0%" y1="0%" x2="100%" y2="100%">
+				<stop offset="0%" stop-color="#ffaf8b" />
+				<stop offset="100%" stop-color="#fa4225" />
+			</linearGradient>
+		</defs>
+		<path fill="url(#undo-backing)"
+			d="M7,2 v-2 l-3,-3 h-6 v-3 l-6,6 l6,6 v-3 h3 v3 h6 " />
+		<rect width="4" height="2" x="2" y="3" fill="url(#undo-inner)" />
+		<rect width="2" height="1" x="3" y="3" fill="url(#undo-center)" />
+		<path fill="url(#undo-inner)" d="M6,2 v-1.5 l-2.5,-2.5 l-6.5,0 v-2 l-4,4 l4,4 v-2 " />
+		<path fill="url(#undo-center)" d="M5,1 l-2,-2 l-6.75,0 v-1 l-2,2 l2,2 v-1" />
+	</g>
+</svg>
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
index e7539a903..37f1e6fe3 100644
--- a/src/sqlitedb.cpp
+++ b/src/sqlitedb.cpp
@@ -564,7 +564,7 @@ void DBBrowserDB::getSqliteVersion(QString& sqlite, QString& sqlcipher)
 #endif
 }
 
-bool DBBrowserDB::setSavepoint(const std::string& pointname)
+bool DBBrowserDB::setSavepoint(const std::string& pointname, bool unique)
 {
     if(!isOpen())
         return false;
@@ -572,7 +572,7 @@ bool DBBrowserDB::setSavepoint(const std::string& pointname)
         qWarning() << "setSavepoint: not done. DB is read-only";
         return false;
     }
-    if(contains(savepointList, pointname))
+    if(unique && contains(savepointList, pointname))
         return true;
 
     executeSQL("SAVEPOINT " + sqlb::escapeIdentifier(pointname) + ";", false, true);
diff --git a/src/sqlitedb.h b/src/sqlitedb.h
index aa7cb4fa7..8bf2bfab1 100644
--- a/src/sqlitedb.h
+++ b/src/sqlitedb.h
@@ -123,7 +123,7 @@ class DBBrowserDB : public QObject
     **/
     db_pointer_type get (const QString& user, bool force_wait = false);
 
-    bool setSavepoint(const std::string& pointname = "RESTOREPOINT");
+    bool setSavepoint(const std::string& pointname = "RESTOREPOINT", bool unique = true);
     bool releaseSavepoint(const std::string& pointname = "RESTOREPOINT");
     bool revertToSavepoint(const std::string& pointname = "RESTOREPOINT");
     bool releaseAllSavepoints();
diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
index 31dd3f216..530484327 100644
--- a/src/sqlitetablemodel.cpp
+++ b/src/sqlitetablemodel.cpp
@@ -473,6 +473,8 @@ bool SqliteTableModel::setTypedData(const QModelIndex& index, bool isBlob, const
         return false;
     }
 
+    m_db.setSavepoint("DB4S_UNDO", false);
+
     if(index.isValid() && role == Qt::EditRole)
     {
         std::unique_lock<std::mutex> lock(m_mutexDataCache);