diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
index 17f8e004..f41ca16c 100644
--- a/src/TableBrowser.cpp
+++ b/src/TableBrowser.cpp
@@ -19,6 +19,9 @@
 #include <QShortcut>
 #include <QTextCodec>
 
+QMap<sqlb::ObjectIdentifier, BrowseDataTableSettings> TableBrowser::browseTableSettings;
+QString TableBrowser::defaultBrowseTableEncoding;
+
 TableBrowser::TableBrowser(QWidget* parent) :
     QWidget(parent),
     ui(new Ui::TableBrowser),
diff --git a/src/TableBrowser.h b/src/TableBrowser.h
index 595b98b8..9968c8d1 100644
--- a/src/TableBrowser.h
+++ b/src/TableBrowser.h
@@ -164,8 +164,8 @@ private:
     /// re-initialized when switching to another table)
     SqliteTableModel* m_browseTableModel;
 
-    QMap<sqlb::ObjectIdentifier, BrowseDataTableSettings> browseTableSettings;  // TODO This probably wants to be static as soon as we have multiple instances of this class
-    QString defaultBrowseTableEncoding;
+    static QMap<sqlb::ObjectIdentifier, BrowseDataTableSettings> browseTableSettings;  // This is static, so settings are shared between instances
+    static QString defaultBrowseTableEncoding;
 
     Palette m_condFormatPalette;
 };