diff --git a/modules/gui/src/gl_canvas.cc b/modules/gui/src/gl_canvas.cc
index eec0192e9506629550b08340c6d44f8de183eaf6..d1714e803300fb63268865d83dc527d5079e7dfd 100644
--- a/modules/gui/src/gl_canvas.cc
+++ b/modules/gui/src/gl_canvas.cc
@@ -134,6 +134,9 @@ MouseEvent::Buttons GLCanvas::TranslateButtons(Qt::MouseButtons buttons) const
   
 void GLCanvas::mouseMoveEvent(QMouseEvent* event)
 {
+  if (!(show_beacon_ || event->buttons())) {
+    return;
+  }
   if (this->IsToolEvent(event)) {
     if (ToolManager::Instance().GetActiveTool()) {
       MouseEvent mouse_event(this->TranslateButtons(event->buttons()), 
@@ -163,7 +166,7 @@ void GLCanvas::mousePressEvent(QMouseEvent* event)
     this->HandleMousePressEvent(event);
   }
   last_pos_=QPoint(event->x(), event->y());
-  this->DoRefresh();  
+  this->DoRefresh();
 }
 
 void GLCanvas::mouseReleaseEvent(QMouseEvent* event)
@@ -181,7 +184,7 @@ void GLCanvas::mouseReleaseEvent(QMouseEvent* event)
     }
   }
   last_pos_=QPoint(event->x(), event->y());
-  this->DoRefresh();  
+  this->DoRefresh();
 }
 
 void GLCanvas::mouseDoubleClickEvent(QMouseEvent* event)
@@ -203,7 +206,9 @@ void GLCanvas::mouseDoubleClickEvent(QMouseEvent* event)
       scene.SetCenter(atom.GetPos());
     }
   }
-  this->DoRefresh();  
+  if (show_beacon_) {
+    this->DoRefresh();
+  }
 }
 
 void GLCanvas::RequestContextMenu(const QPoint& pos)
diff --git a/modules/gui/src/tools/selection_tool.cc b/modules/gui/src/tools/selection_tool.cc
index dfc45ca8f0aa55cc979336f8a54c0d9cbaf42730..4b3ad64822b893ca66f9e05f7d1ff6b8421d07c4 100644
--- a/modules/gui/src/tools/selection_tool.cc
+++ b/modules/gui/src/tools/selection_tool.cc
@@ -55,7 +55,8 @@ void SelectionTool::Click(const MouseEvent& event)
   int sel_mode=this->GetSelectionMode();
   gfx::Scene& scene=gfx::Scene::Instance();
   scene.SetSelectionMode(sel_mode);
-  scene.Pick(event.GetPos().x(), scene.GetViewport().height-event.GetPos().y(), 8);
+  scene.Pick(event.GetPos().x(), 
+             scene.GetViewport().height-event.GetPos().y(), 8);
 }