diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/session/SessionManagerViewer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/session/SessionManagerViewer.java
index 079f5fa443cfe85c28fead8225053b6c40a817f6..21d36f583b24dcc547a2095b9a331a23f3ab8c9e 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/session/SessionManagerViewer.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/session/SessionManagerViewer.java
@@ -144,6 +144,9 @@ public class SessionManagerViewer
 
     protected void onSessionSelect(DBAServerSession session)
     {
+        if (curSession == session) {
+            return;
+        }
         curSession = session;
         updateSQL();
         if (session == null) {
@@ -183,15 +186,11 @@ public class SessionManagerViewer
     }
 
     protected void updateSQL() {
-        try {
-            String text = curSession == null ? "" : CommonUtils.notEmpty(curSession.getActiveQuery());
-            StringEditorInput sqlInput = new StringEditorInput(sessionTable.getShell().getText(), text, true, GeneralUtils.getDefaultFileEncoding());
-            sqlViewer.init(subSite, sqlInput);
-            if (sqlViewer.getTextViewer() != null) {
-                sqlViewer.reloadSyntaxRules();
-            }
-        } catch (PartInitException e) {
-            DBUserInterface.getInstance().showError(sessionTable.getShell().getText(), null, e);
+        String text = curSession == null ? "" : CommonUtils.notEmpty(curSession.getActiveQuery());
+        StringEditorInput sqlInput = new StringEditorInput(sessionTable.getShell().getText(), text, true, GeneralUtils.getDefaultFileEncoding());
+        sqlViewer.setInput(sqlInput);
+        if (sqlViewer.getTextViewer() != null) {
+            sqlViewer.reloadSyntaxRules();
         }
     }