diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
index c5aecea2..80fb84bb 100644
--- a/src/sqlitetablemodel.cpp
+++ b/src/sqlitetablemodel.cpp
@@ -10,11 +10,18 @@ SqliteTableModel::SqliteTableModel(QObject* parent, DBBrowserDB* db, size_t chun
     : QAbstractTableModel(parent)
     , m_db(db)
     , m_rowCount(0)
-    , m_iSortColumn(0)
-    , m_sSortOrder("ASC")
     , m_chunkSize(chunkSize)
     , m_valid(false)
 {
+    reset();
+}
+
+void SqliteTableModel::reset()
+{
+    m_iSortColumn = 0;
+    m_sSortOrder = "ASC";
+    m_headers.clear();
+    m_mWhere.clear();
 }
 
 void SqliteTableModel::setChunkSize(size_t chunksize)
@@ -24,17 +31,16 @@ void SqliteTableModel::setChunkSize(size_t chunksize)
 
 void SqliteTableModel::setTable(const QString& table)
 {
+    reset();
+
     m_sTable = table;
 
-    m_headers.clear();
     QString rowid = "rowid";
     if(m_db->getObjectByName(table).gettype() == "table")
         rowid = sqlb::Table::parseSQL(m_db->getObjectByName(table).getsql()).rowidColumn();
     m_headers.push_back(rowid);
     m_headers.append(m_db->getTableFields(table));
 
-    m_mWhere.clear();
-
     buildQuery();
 }
 
@@ -84,10 +90,7 @@ void SqliteTableModel::setQuery(const QString& sQuery, bool dontClearHeaders)
 {
     // clear
     if(!dontClearHeaders)
-    {
-        m_mWhere.clear();
-        m_headers.clear();
-    }
+        reset();
 
     if(!m_db->isOpen())
         return;
diff --git a/src/sqlitetablemodel.h b/src/sqlitetablemodel.h
index 5da765c8..5ada5fce 100644
--- a/src/sqlitetablemodel.h
+++ b/src/sqlitetablemodel.h
@@ -11,6 +11,7 @@ class SqliteTableModel : public QAbstractTableModel
     Q_OBJECT
 public:
     explicit SqliteTableModel(QObject *parent = 0, DBBrowserDB* db = 0, size_t chunkSize = 50000);
+    void reset();
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int totalRowCount() const;