diff --git a/src/EditIndexDialog.cpp b/src/EditIndexDialog.cpp
index 69ae484d..2bfb8851 100644
--- a/src/EditIndexDialog.cpp
+++ b/src/EditIndexDialog.cpp
@@ -49,9 +49,6 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const QString& indexName, bool
     } else {
         tableChanged(ui->comboTableName->currentText(), false);
     }
-
-    // Refresh SQL preview
-    updateSqlText();
 }
 
 EditIndexDialog::~EditIndexDialog()
@@ -76,52 +73,61 @@ void EditIndexDialog::tableChanged(const QString& new_table, bool initialLoad)
         return;
     }
 
-    // And fill the table again
-    QStringList fields = pdb.getObjectByName(new_table).dynamicCast<sqlb::Table>()->fieldNames();
-    ui->tableIndexColumns->setRowCount(fields.size());
-    for(int i=0; i < fields.size(); ++i)
+    updateColumnLists();
+}
+
+void EditIndexDialog::updateColumnLists()
+{
+    // Fill the table column list
+    sqlb::FieldInfoList tableFields = pdb.getObjectByName(index.table()).dynamicCast<sqlb::Table>()->fieldInformation();
+    ui->tableTableColumns->setRowCount(tableFields.size());
+    int tableRows = 0;
+    for(int i=0;i<tableFields.size();++i)
+    {
+        // When we're doing the initial loading and this field already is in the index to edit, then don't add it to the
+        // list of table columns. It will be added to the list of index columns in the next step. When this is not the initial
+        // loading, the index column list is empty, so this check will always be true.
+        if(index.findColumn(tableFields.at(i).name) == -1)
+        {
+            // Put the name of the field in the first column
+            QTableWidgetItem* name = new QTableWidgetItem(tableFields.at(i).name);
+            name->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+            ui->tableTableColumns->setItem(tableRows, 0, name);
+
+            // Put the data type in the second column
+            QTableWidgetItem* type = new QTableWidgetItem(tableFields.at(i).type);
+            type->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+            ui->tableTableColumns->setItem(tableRows, 1, type);
+
+            tableRows++;
+        }
+    }
+
+    // Set row count to actual count. This is needed for the intial loading, when some rows might have been omitted because they were used in the index
+    ui->tableTableColumns->setRowCount(tableRows);
+
+    // Fill the index column list. This is done separately from the table column to include expression columns (these are not found in the original
+    // table) and to preserve the order of the index columns
+    sqlb::FieldInfoList indexFields = index.fieldInformation();
+    ui->tableIndexColumns->setRowCount(indexFields.size());
+    for(int i=0;i<indexFields.size();++i)
     {
         // Put the name of the field in the first column
-        QTableWidgetItem* name = new QTableWidgetItem(fields.at(i));
+        QTableWidgetItem* name = new QTableWidgetItem(indexFields.at(i).name);
         name->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
         ui->tableIndexColumns->setItem(i, 0, name);
 
-        // Put a checkbox to enable usage in the index of this field in the second column
-        QCheckBox* enabled = new QCheckBox(this);
-        if(initialLoad && index.findColumn(fields.at(i)) != -1)
-            enabled->setCheckState(Qt::Checked);
-        else
-            enabled->setCheckState(Qt::Unchecked);
-        ui->tableIndexColumns->setCellWidget(i, 1, enabled);
-        connect(enabled, static_cast<void(QCheckBox::*)(bool)>(&QCheckBox::toggled),
-                [=](bool use_in_index)
-        {
-            if(use_in_index)
-            {
-                index.addColumn(sqlb::IndexedColumnPtr(new sqlb::IndexedColumn(
-                                                           ui->tableIndexColumns->item(i, 0)->text(),
-                                                           false,
-                                                           qobject_cast<QComboBox*>(ui->tableIndexColumns->cellWidget(i, 2))->currentText())));
-            } else {
-                index.removeColumn(ui->tableIndexColumns->item(i, 0)->text());
-            }
-
-            checkInput();
-            updateSqlText();
-        });
-
         // And put a combobox to select the order in which to index the field in the last column
         QComboBox* order = new QComboBox(this);
         order->addItem("");
         order->addItem("ASC");
         order->addItem("DESC");
-        if(initialLoad && index.findColumn(fields.at(i)) != -1)
-            order->setCurrentText(index.column(index.findColumn(fields.at(i)))->order());
-        ui->tableIndexColumns->setCellWidget(i, 2, order);
+        order->setCurrentText(indexFields.at(i).type.toUpper());
+        ui->tableIndexColumns->setCellWidget(i, 1, order);
         connect(order, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged),
                 [=](QString new_order)
         {
-            int colnum = index.findColumn(fields.at(i));
+            int colnum = index.findColumn(indexFields.at(i).name);
             if(colnum != -1)
             {
                 index.column(colnum)->setOrder(new_order);
@@ -130,7 +136,50 @@ void EditIndexDialog::tableChanged(const QString& new_table, bool initialLoad)
         });
     }
 
-    updateSqlText();
+    checkInput();
+}
+
+void EditIndexDialog::addToIndex(const QModelIndex& idx)
+{
+    // Get current row number
+    int row;
+    if(idx.isValid())
+        row = idx.row();
+    else
+        row = ui->tableTableColumns->currentRow();
+
+    // No row selected? Abort.
+    if(row == -1)
+        return;
+
+    // Add field to index
+    index.addColumn(sqlb::IndexedColumnPtr(new sqlb::IndexedColumn(
+                                               ui->tableTableColumns->item(row, 0)->text(),     // Column name
+                                               false,                                           // Is expression
+                                               "")));                                           // Order
+
+    // Update UI
+    updateColumnLists();
+}
+
+void EditIndexDialog::removeFromIndex(const QModelIndex& idx)
+{
+    // Get current row number
+    int row;
+    if(idx.isValid())
+        row = idx.row();
+    else
+        row = ui->tableIndexColumns->currentRow();
+
+    // No row selected? Abort.
+    if(row == -1)
+        return;
+
+    // Remove column from index
+    index.removeColumn(ui->tableIndexColumns->item(row, 0)->text());
+
+    // Update UI
+    updateColumnLists();
 }
 
 void EditIndexDialog::checkInput()
diff --git a/src/EditIndexDialog.h b/src/EditIndexDialog.h
index caf2e3b3..574a6d66 100644
--- a/src/EditIndexDialog.h
+++ b/src/EditIndexDialog.h
@@ -4,6 +4,7 @@
 #include "sqlitetypes.h"
 
 #include <QDialog>
+#include <QModelIndex>
 
 class DBBrowserDB;
 
@@ -23,6 +24,8 @@ private slots:
     void accept();
     void tableChanged(const QString& new_table, bool initialLoad = false);
     void checkInput();
+    void addToIndex(const QModelIndex& idx = QModelIndex());
+    void removeFromIndex(const QModelIndex& idx = QModelIndex());
 
 private:
     DBBrowserDB& pdb;
@@ -31,6 +34,7 @@ private:
     bool newIndex;
     Ui::EditIndexDialog* ui;
 
+    void updateColumnLists();
     void updateSqlText();
 };
 
diff --git a/src/EditIndexDialog.ui b/src/EditIndexDialog.ui
index 7ad3d399..61b8b67e 100644
--- a/src/EditIndexDialog.ui
+++ b/src/EditIndexDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>610</width>
-    <height>504</height>
+    <width>686</width>
+    <height>506</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,15 +17,9 @@
    <iconset resource="icons/icons.qrc">
     <normaloff>:/icons/index_create</normaloff>:/icons/index_create</iconset>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-     </property>
-     <property name="formAlignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
      <item row="0" column="0">
       <widget class="QLabel" name="labelIndexName">
        <property name="text">
@@ -72,7 +66,7 @@
      <item row="3" column="0">
       <widget class="QLabel" name="labelIndexColumns">
        <property name="text">
-        <string>&amp;Columns</string>
+        <string>Colu&amp;mns</string>
        </property>
        <property name="buddy">
         <cstring>tableIndexColumns</cstring>
@@ -81,61 +75,155 @@
      </item>
      <item row="3" column="1">
       <widget class="QSplitter" name="splitter">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <widget class="QTableWidget" name="tableIndexColumns">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-          <horstretch>0</horstretch>
-          <verstretch>1</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>250</height>
-         </size>
-        </property>
-        <property name="editTriggers">
-         <set>QAbstractItemView::NoEditTriggers</set>
-        </property>
-        <property name="showDropIndicator" stdset="0">
-         <bool>false</bool>
-        </property>
-        <property name="alternatingRowColors">
-         <bool>true</bool>
-        </property>
-        <property name="selectionMode">
-         <enum>QAbstractItemView::NoSelection</enum>
-        </property>
-        <attribute name="verticalHeaderVisible">
-         <bool>false</bool>
-        </attribute>
-        <column>
-         <property name="text">
-          <string>Column</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Use in Index</string>
-         </property>
-        </column>
-        <column>
-         <property name="text">
-          <string>Order</string>
-         </property>
-        </column>
+       <widget class="QWidget" name="layoutWidget">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QTableWidget" name="tableTableColumns">
+           <property name="editTriggers">
+            <set>QAbstractItemView::NoEditTriggers</set>
+           </property>
+           <property name="showDropIndicator" stdset="0">
+            <bool>false</bool>
+           </property>
+           <property name="alternatingRowColors">
+            <bool>true</bool>
+           </property>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::SingleSelection</enum>
+           </property>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <attribute name="horizontalHeaderStretchLastSection">
+            <bool>true</bool>
+           </attribute>
+           <attribute name="verticalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>Table column</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Type</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <widget class="QToolButton" name="buttonToIndex">
+             <property name="icon">
+              <iconset resource="icons/icons.qrc">
+               <normaloff>:/icons/run</normaloff>:/icons/run</iconset>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QToolButton" name="buttonFromIndex">
+             <property name="icon">
+              <iconset resource="icons/icons.qrc">
+               <normaloff>:/icons/resultset_previous.png</normaloff>:/icons/resultset_previous.png</iconset>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QTableWidget" name="tableIndexColumns">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+             <horstretch>0</horstretch>
+             <verstretch>1</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>250</height>
+            </size>
+           </property>
+           <property name="editTriggers">
+            <set>QAbstractItemView::NoEditTriggers</set>
+           </property>
+           <property name="showDropIndicator" stdset="0">
+            <bool>false</bool>
+           </property>
+           <property name="alternatingRowColors">
+            <bool>true</bool>
+           </property>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::SingleSelection</enum>
+           </property>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <attribute name="horizontalHeaderStretchLastSection">
+            <bool>true</bool>
+           </attribute>
+           <attribute name="verticalHeaderVisible">
+            <bool>false</bool>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>Index column</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Order</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+        </layout>
        </widget>
-       <widget class="SqlTextEdit" name="sqlTextEdit">
+       <widget class="SqlTextEdit" name="sqlTextEdit" native="true">
         <property name="minimumSize">
          <size>
           <width>0</width>
           <height>100</height>
          </size>
         </property>
-        <property name="readOnly">
+        <property name="readOnly" stdset="0">
          <bool>true</bool>
         </property>
        </widget>
@@ -167,8 +255,10 @@
   <tabstop>editIndexName</tabstop>
   <tabstop>comboTableName</tabstop>
   <tabstop>checkIndexUnique</tabstop>
+  <tabstop>tableTableColumns</tabstop>
   <tabstop>tableIndexColumns</tabstop>
-  <tabstop>buttonBox</tabstop>
+  <tabstop>buttonToIndex</tabstop>
+  <tabstop>buttonFromIndex</tabstop>
  </tabstops>
  <resources>
   <include location="icons/icons.qrc"/>
@@ -181,8 +271,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>252</x>
-     <y>337</y>
+     <x>258</x>
+     <y>499</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
@@ -197,8 +287,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>320</x>
-     <y>337</y>
+     <x>326</x>
+     <y>499</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
@@ -213,8 +303,8 @@
    <slot>tableChanged(QString)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>91</x>
-     <y>43</y>
+     <x>145</x>
+     <y>74</y>
     </hint>
     <hint type="destinationlabel">
      <x>236</x>
@@ -261,8 +351,8 @@
    <slot>checkInput()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>332</x>
-     <y>90</y>
+     <x>90</x>
+     <y>100</y>
     </hint>
     <hint type="destinationlabel">
      <x>304</x>
@@ -270,9 +360,77 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>buttonToIndex</sender>
+   <signal>clicked()</signal>
+   <receiver>EditIndexDialog</receiver>
+   <slot>addToIndex()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>372</x>
+     <y>217</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>385</x>
+     <y>103</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonFromIndex</sender>
+   <signal>clicked()</signal>
+   <receiver>EditIndexDialog</receiver>
+   <slot>removeFromIndex()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>382</x>
+     <y>257</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>350</x>
+     <y>95</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>tableIndexColumns</sender>
+   <signal>doubleClicked(QModelIndex)</signal>
+   <receiver>EditIndexDialog</receiver>
+   <slot>removeFromIndex(QModelIndex)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>520</x>
+     <y>236</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>684</x>
+     <y>175</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>tableTableColumns</sender>
+   <signal>doubleClicked(QModelIndex)</signal>
+   <receiver>EditIndexDialog</receiver>
+   <slot>addToIndex(QModelIndex)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>104</x>
+     <y>228</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>19</x>
+     <y>205</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>tableChanged(QString)</slot>
   <slot>checkInput()</slot>
+  <slot>addToIndex()</slot>
+  <slot>addToIndex(QModelIndex)</slot>
+  <slot>removeFromIndex()</slot>
+  <slot>removeFromIndex(QModelIndex)</slot>
  </slots>
 </ui>