diff --git a/ui/src/app/app.tsx b/ui/src/app/app.tsx
index 2e8d8db8c2..283db04671 100644
--- a/ui/src/app/app.tsx
+++ b/ui/src/app/app.tsx
@@ -1,4 +1,4 @@
-import {DataLoader, Layout, NavigationManager, Notifications, NotificationsManager, PageContext, Popup, PopupManager, PopupProps} from 'argo-ui';
+import {DataLoader, Layout, NavigationManager, Notifications, NotificationsManager, PageContext, Popup, PopupManager, PopupProps, Tooltip} from 'argo-ui';
 import {createBrowserHistory} from 'history';
 import * as PropTypes from 'prop-types';
 import * as React from 'react';
@@ -175,7 +175,15 @@ export class App extends React.Component<{}, {popupProps: PopupProps; error: Err
                                                 ) : (
                                                     <Layout
                                                         navItems={navItems}
-                                                        version={() => <DataLoader load={() => services.version.version()}>{msg => msg.Version}</DataLoader>}>
+                                                        version={() => (
+                                                            <DataLoader load={() => services.version.version()}>
+                                                                {msg => (
+                                                                    <Tooltip content={msg.Version}>
+                                                                        <span>{msg.Version}</span>
+                                                                    </Tooltip>
+                                                                )}
+                                                            </DataLoader>
+                                                        )}>
                                                         <route.component {...routeProps} />
                                                     </Layout>
                                                 )