diff --git a/packages/core/client/src/pm/PluginManagerLink.tsx b/packages/core/client/src/pm/PluginManagerLink.tsx
index 4192d3250..47bb7deec 100644
--- a/packages/core/client/src/pm/PluginManagerLink.tsx
+++ b/packages/core/client/src/pm/PluginManagerLink.tsx
@@ -1,5 +1,5 @@
 import { ApiOutlined, SettingOutlined } from '@ant-design/icons';
-import { Button, Dropdown, Menu } from 'antd';
+import { Button, Dropdown, Menu, Tooltip } from 'antd';
 import React, { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
@@ -11,13 +11,15 @@ export const PluginManagerLink = () => {
   const { t } = useTranslation();
   const history = useHistory();
   return (
-    <Button
-      icon={<ApiOutlined />}
-      title={t('Plugin manager')}
-      onClick={() => {
-        history.push('/admin/pm/list');
-      }}
-    />
+    <Tooltip title={t('Plugin manager')}>
+      <Button
+        icon={<ApiOutlined />}
+        title={t('Plugin manager')}
+        onClick={() => {
+          history.push('/admin/pm/list');
+        }}
+      />
+    </Tooltip>
   );
 };
 
diff --git a/packages/core/client/src/schema-component/core/DesignableSwitch.tsx b/packages/core/client/src/schema-component/core/DesignableSwitch.tsx
index 66a250408..f4bca2b64 100644
--- a/packages/core/client/src/schema-component/core/DesignableSwitch.tsx
+++ b/packages/core/client/src/schema-component/core/DesignableSwitch.tsx
@@ -1,5 +1,5 @@
 import { HighlightOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
+import { Button, Tooltip } from 'antd';
 import React from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';
@@ -17,15 +17,17 @@ export const DesignableSwitch = () => {
   useHotkeys('Ctrl+Shift+U', () => setDesignable(!designable), [designable]);
 
   return (
-    <Button
-      // selected={designable}
-      icon={<HighlightOutlined />}
-      title={t('UI Editor')}
-      // subtitle={'Ctrl+Shift+U'}
-      style={style}
-      onClick={() => {
-        setDesignable(!designable);
-      }}
-    />
+    <Tooltip title={t('UI Editor')}>
+      <Button
+        // selected={designable}
+        icon={<HighlightOutlined />}
+        title={t('UI Editor')}
+        // subtitle={'Ctrl+Shift+U'}
+        style={style}
+        onClick={() => {
+          setDesignable(!designable);
+        }}
+      />
+    </Tooltip>
   );
 };