diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 01aeb7544..525a2ff87 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -35,6 +35,7 @@ Rai (Michal Pokorny) <agentydragon@gmail.com>
 Zeno Gantner <zeno.gantner@gmail.com>
 Henrik Giesel <hengiesel@gmail.com>
 Michał Bartoszkiewicz <mbartoszkiewicz@gmail.com>
+Sander Santema <github.com/sandersantema/>
 
 ********************
 
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 912b80295..618140a42 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -32,6 +32,8 @@ from aqt.utils import (
     getFile,
     openHelp,
     qtMenuShortcutWorkaround,
+    restoreGeom,
+    saveGeom,
     shortcut,
     showInfo,
     showWarning,
@@ -523,6 +525,7 @@ class Editor:
         d = QDialog(self.widget)
         form = aqt.forms.edithtml.Ui_Dialog()
         form.setupUi(d)
+        restoreGeom(d, "htmlEditor")
         qconnect(form.buttonBox.helpRequested, lambda: openHelp("editor"))
         form.textEdit.setPlainText(self.note.fields[field])
         d.show()
@@ -533,13 +536,14 @@ class Editor:
         if html.find(">") > -1:
             # filter html through beautifulsoup so we can strip out things like a
             # leading </div>
-            with warnings.catch_warnings() as w:
+            with warnings.catch_warnings():
                 warnings.simplefilter("ignore", UserWarning)
                 html = str(BeautifulSoup(html, "html.parser"))
         self.note.fields[field] = html
         if not self.addMode:
             self.note.flush()
         self.loadNote(focusTo=field)
+        saveGeom(d, "htmlEditor")
 
     # Tag handling
     ######################################################################