diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index e646feb01..bd696c885 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -695,7 +695,6 @@ void CMakeSetupDialog::removeSelectedCacheEntries()
     {
     pidxs.append(i);
     }
-  this->CacheValues->selectionModel()->clear();
   foreach(QPersistentModelIndex pi, pidxs)
     {
     this->CacheValues->model()->removeRow(pi.row());
diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index 466006a71..ba9ece322 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -70,7 +70,10 @@ QCMakeCacheView::QCMakeCacheView(QWidget* p)
   QCMakeCacheModelDelegate* delegate = new QCMakeCacheModelDelegate(this);
   this->setItemDelegate(delegate);
   
-  this->setEditTriggers(QAbstractItemView::AllEditTriggers);
+  this->setEditTriggers(QAbstractItemView::DoubleClicked |
+                        QAbstractItemView::SelectedClicked |
+                        QAbstractItemView::EditKeyPressed |
+                        QAbstractItemView::AnyKeyPressed);
 
   // set up headers and sizes
   int h = 0;
@@ -146,7 +149,6 @@ bool QCMakeCacheView::showAdvanced() const
 
 void QCMakeCacheView::setSearchFilter(const QString& s)
 {
-  this->selectionModel()->clear();
   this->SearchFilter->setFilterFixedString(s);
 }