diff --git a/sidebar/SidebarMode.cpp b/sidebar/SidebarMode.cpp
--- a/sidebar/SidebarMode.cpp
+++ b/sidebar/SidebarMode.cpp
@@ -387,6 +387,9 @@
 
 void SidebarMode::changeModule( const QModelIndex& activeModule )
 {
+    if( !d->moduleView->resolveChanges() ) {
+        return;
+    }
     d->moduleView->closeModules();
 
     const int subRows = d->searchModel->rowCount(activeModule);
@@ -440,6 +443,10 @@
         return;
     }
 
+    if( !d->moduleView->resolveChanges() ) {
+        return;
+    }
+
     d->activeSubCategory = cat;
     d->moduleView->closeModules();
     d->moduleView->loadModule( d->subCategoryModel->index(cat, 0) );