diff --git a/webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx b/webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx
index cd831342bad..c9b43a09a4a 100644
--- a/webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx
+++ b/webapp/packages/plugin-codemirror6/src/ReactCodemirror.tsx
@@ -226,7 +226,10 @@ export const ReactCodemirror = observer<IReactCodeMirrorProps, IEditorRef>(
         }
 
         if (transaction.selection) {
-          view.dispatch({ selection: transaction.selection });
+          view.dispatch({ selection: transaction.selection, scrollIntoView: true });
+          if (!view.hasFocus) {
+            view.focus();
+          }
         }
       }
     });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorTools.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorTools.tsx
index de1a11a336c..cd2c79292a1 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorTools.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditorTools.tsx
@@ -45,7 +45,7 @@ export const SqlEditorTools = observer<Props>(function SqlEditorTools({ data, st
     }
   }
 
-  async function downloadScriptHandler() {
+  function downloadScriptHandler() {
     tools.downloadScript(data.value.trim());
   }
 
diff --git a/webapp/packages/plugin-system-information-administration/src/SystemInformation.tsx b/webapp/packages/plugin-system-information-administration/src/SystemInformation.tsx
index 6f23f577e47..7dd7dc6d0ea 100644
--- a/webapp/packages/plugin-system-information-administration/src/SystemInformation.tsx
+++ b/webapp/packages/plugin-system-information-administration/src/SystemInformation.tsx
@@ -22,6 +22,7 @@ import {
   useObjectPropertyCategories,
   GroupTitle,
   Container,
+  TextPlaceholder,
 } from '@cloudbeaver/core-blocks';
 import type { TabContainerPanelComponent } from '@cloudbeaver/core-ui';
 import { SystemInformationResource } from './SystemInformationResource.js';
@@ -44,6 +45,10 @@ export const SystemInformation: TabContainerPanelComponent<AdministrationItemCon
     }
   }
 
+  if (!properties.length) {
+    return <TextPlaceholder>{translate('ui_no_items_placeholder')}</TextPlaceholder>;
+  }
+
   return (
     <ColoredContainer overflow parent>
       <Group gap medium wrap>