diff --git a/.gitignore b/.gitignore
index 7f1f79b20..e7dfa1fa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *.pyc
 *.py.bak
-*.swp
 *.tiny.css
 data/var/log/plinth/*.log
 data/var/lib/plinth/*.sqlite3
@@ -18,7 +17,6 @@ doc/dev/_build
 *~
 predepend
 build/
-.emacs.desktop*
 *.egg-info/
 dist/
 .coverage
@@ -29,7 +27,6 @@ functional_tests/test_plinth/
 geckodriver.log
 *.mo
 .vagrant/
-.idea/
 .DS_Store
 *.box
 .eggs
@@ -48,3 +45,9 @@ debian/plinth.debhelper.log
 debian/plinth.substvars
 debian/plinth/
 *.pytest_cache/
+
+# Editor settings
+.vscode/
+.idea/
+*.swp
+.emacs.desktop*