diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 72493fd50..1201d25b9 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -95,8 +95,7 @@
 #include <SVTK_ViewModel.h>
 #include <SVTK_InteractorStyle.h>
 #include <SVTK_RenderWindowInteractor.h>
-
-#include <VTKViewer_ViewManager.h>
+#include <SVTK_ViewManager.h>
 
 #include "OB_Browser.h"
 
@@ -2755,7 +2754,7 @@ void SMESHGUI::initialize( CAM_Application* app )
   // Display / Erase
   //-------------------------------------------------
   aClient = "($client in {'VTKViewer' 'ObjectBrowser'})";
-  QString anActiveVTK = QString("activeView = '%1'").arg(VTKViewer_Viewer::Type());
+  QString anActiveVTK = QString("activeView = '%1'").arg(SVTK_Viewer::Type());
   QString aSelCount = QString( "%1 > 0" ).arg( QtxPopupMgr::Selection::defSelCountParam() );
 
   QString aRule = "$component={'SMESH'} and ( type='Component' or (" + aClient + " and " +
@@ -2842,7 +2841,7 @@ void SMESHGUI::viewManagers( QStringList& list ) const
 
 void SMESHGUI::onViewManagerAdded( SUIT_ViewManager* mgr )
 {
-  if ( dynamic_cast<VTKViewer_ViewManager*>( mgr ) )
+  if ( dynamic_cast<SVTK_ViewManager*>( mgr ) )
     SMESH::UpdateSelectionProp( this );
 }
 
diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
index a58fd065e..d32bd78d7 100644
--- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
@@ -39,8 +39,6 @@
 #include "SMESH_TypeFilter.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "VTKViewer_ViewWindow.h"
-
 #include "SUIT_ResourceMgr.h"
 
 #include "SalomeApp_Application.h"
diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
index fcf0682b4..fb3b03f1d 100755
--- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
@@ -378,6 +378,7 @@ void SMESHGUI_SingleEditDlg::onTextChange (const QString& theNewText)
 	myOkBtn->setEnabled(true);
 	myApplyBtn->setEnabled(true);
       }
+      SMESH::GetViewWindow(mySMESHGUI)->highlight( anIO, true, true );
     }
   }
 }
@@ -407,19 +408,22 @@ void SMESHGUI_SingleEditDlg::onSelectionDone()
   myActor = SMESH::FindActorByEntry(anIO->getEntry());
   if(myActor){
     TVisualObjPtr aVisualObj = myActor->GetObject();
-    if(SMDS_Mesh* aMesh = aVisualObj->GetMesh()){
-      if(SMESH::GetEdgeNodes(mySelector, aVisualObj, anId1, anId2) >= 1){
+    if(SMDS_Mesh* aMesh = aVisualObj->GetMesh())
+    {
+      const SMDS_MeshElement* tria[2];
+      if( SMESH::GetEdgeNodes( mySelector, aVisualObj, anId1, anId2 ) >= 1 &&
+	  findTriangles( aMesh->FindNode( anId1 ), aMesh->FindNode( anId2 ), tria[0],tria[1] ) )
+      {
 	QString aText = QString("%1-%2").arg(anId1).arg(anId2);
 	myBusy = true;
 	myEdge->setText(aText);
 	myBusy = false;
 	
-	const SMDS_MeshElement* tria[2];
-	if (findTriangles(aMesh->FindNode(anId1), aMesh->FindNode(anId2), tria[0],tria[1])) {
-	  myOkBtn->setEnabled(true);
-	  myApplyBtn->setEnabled(true);
-	}
-      } else {
+	myOkBtn->setEnabled(true);
+	myApplyBtn->setEnabled(true);
+      }
+      else
+      {
 	myEdge->clear();
       }
     }