diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 49161c1..ef00df1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -166,6 +166,8 @@ void MainWindow::disconnectFromServerRequested()
 {
     ui->button_connect->setEnabled(false);
 
+    delete ui->tableView_database_table->model();
+
     emit disconnectFromServer();
 }
 
@@ -197,6 +199,8 @@ void MainWindow::showTableRequested()
 {
     ui->button_show_table->setEnabled(false);
 
+    delete ui->tableView_database_table->model(); // remove old model
+
     QString table_name = ui->comboBox_table_name->currentText();
 
     emit selectTable(table_name);
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 8b57b3a..c353b38 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -522,7 +522,29 @@
         </widget>
        </item>
        <item row="1" column="0" colspan="4">
-        <widget class="QTableView" name="tableView_database_table"/>
+        <widget class="QTableView" name="tableView_database_table">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="tabKeyNavigation">
+          <bool>false</bool>
+         </property>
+         <property name="dragDropOverwriteMode">
+          <bool>false</bool>
+         </property>
+         <property name="sortingEnabled">
+          <bool>true</bool>
+         </property>
+         <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+          <bool>false</bool>
+         </attribute>
+        </widget>
        </item>
       </layout>
      </widget>