diff --git a/app/assets/javascripts/experiments/show.js b/app/assets/javascripts/experiments/show.js
index 9de3cd6a1..6c8ed5088 100644
--- a/app/assets/javascripts/experiments/show.js
+++ b/app/assets/javascripts/experiments/show.js
@@ -1,4 +1,4 @@
-/* global dropdownSelector */
+/* global dropdownSelector initBSTooltips */
 
 (function() {
   function initNewMyModuleModal() {
@@ -56,6 +56,7 @@
 
         dropdownSelector.selectValues(myModuleUserSelector, $('#new-my-module-modal').data('user-id'));
       });
+    initBSTooltips();
   }
 
   initNewMyModuleModal();
diff --git a/app/assets/javascripts/shared/inline_editing.js b/app/assets/javascripts/shared/inline_editing.js
index 31a451869..de291cce5 100644
--- a/app/assets/javascripts/shared/inline_editing.js
+++ b/app/assets/javascripts/shared/inline_editing.js
@@ -71,6 +71,7 @@ var inlineEditing = (function() {
       data: params,
       success: function(result) {
         var viewData;
+        var parentContainer = container.parent();
         if (container.data('response-field')) {
           // If we want to modify preview element on backend
           // we can use this data field and we will take string from response
@@ -95,11 +96,15 @@ var inlineEditing = (function() {
           .attr('value', inputField(container).val());
         appendAfterLabel(container);
 
-        container.trigger('inlineEditing::updated', [inputField(container).val(), viewData])
+        container.trigger('inlineEditing::updated', [inputField(container).val(), viewData]);
 
         if (SIDEBAR_ITEM_TYPES.includes(paramsGroup)) {
           updateSideBarNav(paramsGroup, itemId, viewData);
         }
+
+        if (parentContainer.attr('data-original-title')) {
+          parentContainer.attr('data-original-title', inputField(container).val());
+        }
       },
       error: function(response) {
         var error = response.responseJSON[fieldToUpdate];
@@ -111,6 +116,7 @@ var inlineEditing = (function() {
         container.find('.error-block').html(error.join(', '));
         inputField(container).focus();
         container.data('disabled', false);
+        $('.tooltip').hide();
       }
     });
     return true;
@@ -147,6 +153,7 @@ var inlineEditing = (function() {
           .addClass('hidden')
           .closest('.inline_scroll_block')
           .scrollTop(container.offsetTop);
+        $('.tooltip').hide();
       }
       e.stopPropagation();
       return true;
diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 83471796f..fd17914cd 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -17,7 +17,7 @@ class ExperimentsController < ApplicationController
   before_action :check_archive_permissions, only: :archive
   before_action :check_clone_permissions, only: %i(clone_modal clone)
   before_action :check_move_permissions, only: %i(move_modal move)
-  before_action :set_inline_name_editing, only: %i(canvas module_archive)
+  before_action :set_inline_name_editing, only: %i(canvas table module_archive)
 
   layout 'fluid'
 
diff --git a/app/views/experiments/_show_header.html.erb b/app/views/experiments/_show_header.html.erb
index 189c8a848..14b765815 100644
--- a/app/views/experiments/_show_header.html.erb
+++ b/app/views/experiments/_show_header.html.erb
@@ -3,7 +3,7 @@
     <%= render partial: 'projects/index/breadcrumbs', locals: {target_folder: @experiment.project.project_folder, project: @experiment.project, experiment: @experiment} %>
   </div>
   <div class="title-row">
-    <h1 class="project-name">
+    <h1 class="project-name" data-toggle="tooltip" data-placement="bottom" title="<%= @experiment.name %>">
       <% if @experiment.archived? %>
         <i class="fas fa-archive" data-view-mode="archived"></i>
       <% end %>