diff --git a/modules/gui/src/data_viewer/data_viewer_panel_base.cc b/modules/gui/src/data_viewer/data_viewer_panel_base.cc
index ecb6636d174c729f79ef9234f5700497a3a2d8d4..0fb9c0c5b3c85c4c4ca8086becbc4fc1e88a4e47 100644
--- a/modules/gui/src/data_viewer/data_viewer_panel_base.cc
+++ b/modules/gui/src/data_viewer/data_viewer_panel_base.cc
@@ -98,7 +98,7 @@ DataViewerPanelBase::DataViewerPanelBase(const Data& data,QWidget* parent):
   on_resize(size().width(),size().height()); // needed for proper initialization
 
   setMouseTracking(true);
-
+  setFocusPolicy(Qt::StrongFocus);
   //TODO cursors
   setCursor(cursor_);
   /*
@@ -606,11 +606,6 @@ void DataViewerPanelBase::wheelEvent(QWheelEvent* event)
   }
 }
 
-void DataViewerPanelBase::enterEvent(QEvent* event)
-{
-  if(!IsDataValid()) return;
-  setFocus();
-}
 
 void DataViewerPanelBase::SetSelectionMode(int mode)
 {
diff --git a/modules/gui/src/data_viewer/data_viewer_panel_base.hh b/modules/gui/src/data_viewer/data_viewer_panel_base.hh
index 875436dfedbb4160c1c5548f03dc042ffc12ee16..d3a6b01d0c282ff611f59d97cf0661217391d8b1 100644
--- a/modules/gui/src/data_viewer/data_viewer_panel_base.hh
+++ b/modules/gui/src/data_viewer/data_viewer_panel_base.hh
@@ -69,7 +69,6 @@ public:
   virtual void mousePressEvent(QMouseEvent* event);
   virtual void mouseReleaseEvent(QMouseEvent* event);
   virtual void mouseMoveEvent(QMouseEvent* event);
-  virtual void enterEvent(QEvent* event);
   virtual void keyPressEvent(QKeyEvent * event);
 
   //void OnMenu(wxCommandEvent& e);