diff --git a/.gitignore b/.gitignore
index 55f446f3..e7cec67b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,5 +73,8 @@ rapidjson/*
 
 Thumbs.db
 
-#I HATE MAC
+# I HATE MAC
 .DS_Store
+
+# Other editors/IDEs
+.vscode
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52fd824c..af00c80f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Minor: Changed the English in two rate-limited system messages (#1878)
 - Minor: Added image for streamer mode in the user popup icon.
 - Minor: Added vip and unvip buttons.
+- Minor: Commands are now saved upon pressing Ok in the settings window
 - Minor: Colorized nicknames now enabled by default
 - Minor: Show channels live now enabled by default
 - Minor: Bold usernames enabled by default
diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp
index 3da3e3aa..f972efaf 100644
--- a/src/widgets/dialogs/SettingsDialog.cpp
+++ b/src/widgets/dialogs/SettingsDialog.cpp
@@ -2,6 +2,7 @@
 
 #include "Application.hpp"
 #include "common/Args.hpp"
+#include "controllers/commands/CommandController.hpp"
 #include "singletons/Resources.hpp"
 #include "util/LayoutCreator.hpp"
 #include "util/Shortcut.hpp"
@@ -318,6 +319,7 @@ void SettingsDialog::onOkClicked()
 {
     if (!getArgs().dontSaveSettings)
     {
+        getApp()->commands->save();
         pajlada::Settings::SettingManager::gSave();
     }
     this->close();