diff --git a/frappe/database/database.py b/frappe/database/database.py
index 19cc1d93d6..3aab284de0 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -930,12 +930,26 @@ class Database(object):
 		if values:
 			query = frappe.safe_decode(self._cursor.mogrify(query, values))
 		if query.strip().lower().split()[0] in ('insert', 'delete', 'update', 'alter'):
-			# ([`\"']?) Captures ', " or ` at the begining of the table name (if provided)
+			# single_word_regex is designed to match following patterns
+			# `tabXxx`, tabXxx and "tabXxx"
+
+			# multi_word_regex is designed to match following patterns
+			# `tabXxx Xxx` and "tabXxx Xxx"
+
+			# ([`"]?) Captures " or ` at the begining of the table name (if provided)
+			# \1 matches the first captured group (quote character) at the end of the table name
+			# multi word table name must have surrounding quotes.
+
 			# (tab([A-Z]\w+)( [A-Z]\w+)*) Captures table names that start with "tab"
 			# and are continued with multiple words that start with a captital letter
 			# e.g. 'tabXxx' or 'tabXxx Xxx' or 'tabXxx Xxx Xxx' and so on
-			# \1 matches the first captured group (quote character) at the end of the table name
-			tables = [groups[1] for groups in re.findall(r'([`"\']?)(tab([A-Z]\w+)( [A-Z]\w+)*)\1', query)]
+
+			single_word_regex = r'([`"]?)(tab([A-Z]\w+))\1'
+			multi_word_regex = r'([`"])(tab([A-Z]\w+)( [A-Z]\w+)+)\1'
+			tables = []
+			for regex in (single_word_regex, multi_word_regex):
+				tables += [groups[1] for groups in re.findall(regex, query)]
+
 			if frappe.flags.touched_tables is None:
 				frappe.flags.touched_tables = set()
 			frappe.flags.touched_tables.update(tables)
diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py
index 974d3e770e..bb479d67c7 100644
--- a/frappe/tests/test_db.py
+++ b/frappe/tests/test_db.py
@@ -48,6 +48,12 @@ class TestDB(unittest.TestCase):
 		todo.save()
 		self.assertIn('tabToDo', frappe.flags.touched_tables)
 
+		if frappe.db.db_type != "postgres":
+			frappe.flags.touched_tables = set()
+			frappe.db.sql("UPDATE tabToDo SET description = 'Updated Description'")
+			self.assertNotIn('tabToDo SET', frappe.flags.touched_tables)
+			self.assertIn('tabToDo', frappe.flags.touched_tables)
+
 		frappe.flags.touched_tables = set()
 		todo.delete()
 		self.assertIn('tabToDo', frappe.flags.touched_tables)