diff --git a/modules/gui/src/scene_selection.cc b/modules/gui/src/scene_selection.cc
index 3bb9dbf196e96518dd13c442a444972b5cb223bc..9cacf0da2dce17a7752297488df203a1e3fb746e 100644
--- a/modules/gui/src/scene_selection.cc
+++ b/modules/gui/src/scene_selection.cc
@@ -278,9 +278,8 @@ void SceneSelection::SelectAllViews(){
 void SceneSelection::DeselectAllViews(){
   mol::EntityView sel = view_entity_->GetSelection();
   if(sel.IsValid()){
-    for(unsigned int i= 0; i < views_.size(); i++){
-      sel = mol::Difference(sel, views_[i].GetEntityView());
-    }
+    sel = mol::Difference(sel, this->GetViewUnion());
+    view_entity_->SetSelection(sel);
   }
 }
 
diff --git a/modules/gui/src/scene_selection.hh b/modules/gui/src/scene_selection.hh
index 9e3115b8be6ddbb32076bab9045bb319002a60ba..3b5bebabb3aaaca1bccab963d0bd371cf62c446c 100644
--- a/modules/gui/src/scene_selection.hh
+++ b/modules/gui/src/scene_selection.hh
@@ -44,7 +44,9 @@ public:
 public slots:
   void CenterOnObjects();
   void Delete();
+#if OST_IMG_ENABLED
   void ViewDensitySlices();
+#endif // OST_IMG_ENABLED
   void CopyViews();
   void Select();
   void Deselect();
diff --git a/modules/gui/src/scene_win/context_menu.cc b/modules/gui/src/scene_win/context_menu.cc
index 77138a273258f6db01529c5bd24597835cafcf43..f9a66ce92fc86eef41474617efa26ba6870325de 100644
--- a/modules/gui/src/scene_win/context_menu.cc
+++ b/modules/gui/src/scene_win/context_menu.cc
@@ -72,11 +72,16 @@ void ContextMenu::ShowMenu(const QPoint& pos)
           if(gfx_node->GetType()==0){all_not_scene = false;}
           if(!dynamic_cast<gfx::GfxObj*> (gfx_node.get())){all_gfx_objects = false;}
           if(!dynamic_cast<gfx::Entity*> (gfx_node.get())){all_entities = false;}
+#if OST_IMG_ENABLED
           if(!dynamic_cast<gfx::MapIso*> (gfx_node.get())){all_maps = false;}
+#else
+          all_maps = false;
+#endif // OST_IMG_ENABLED
         }
         else{
           all_gfx_objects = false;
           all_entities = false;
+          all_maps = false;
           all_visible = true;
           all_hidden = true;
         }
@@ -154,14 +159,12 @@ void ContextMenu::ShowMenu(const QPoint& pos)
 
     }
 
-    #if OST_IMG_ENABLED
-
+#if OST_IMG_ENABLED
     if(all_maps){
       action = menu->addAction("View Density Slices");
       connect(action, SIGNAL(triggered()), SceneSelection::Instance(), SLOT(ViewDensitySlices()));
     }
-
-    #endif // OST_IMG_ENABLED
+#endif // OST_IMG_ENABLED
 
 
     if(all_entity_views){