diff --git a/docs/en_US/release_notes_4_21.rst b/docs/en_US/release_notes_4_21.rst
index 8cab9665c..ccf1bdc5e 100644
--- a/docs/en_US/release_notes_4_21.rst
+++ b/docs/en_US/release_notes_4_21.rst
@@ -61,6 +61,7 @@ Bug fixes
 | `Issue #5315 <https://redmine.postgresql.org/issues/5315>`_ -  Fixed an issue where schema diff showing changes in the identical domain constraints.
 | `Issue #5350 <https://redmine.postgresql.org/issues/5350>`_ -  Fixed an issue where schema diff marks an identical table as different.
 | `Issue #5351 <https://redmine.postgresql.org/issues/5351>`_ -  Fixed compilation warnings while building pgAdmin.
+| `Issue #5352 <https://redmine.postgresql.org/issues/5352>`_ -  Fixed the rightmost and bottom tooltip crop issues in the explain query plan.
 | `Issue #5361 <https://redmine.postgresql.org/issues/5361>`_ -  Fixes an issue where pgAdmin4 GUI does not display properly in IE 11.
 | `Issue #5362 <https://redmine.postgresql.org/issues/5362>`_ -  Fixed an issue where the identical packages and sequences visible as different in the schema diff tool.
 | `Issue #5366 <https://redmine.postgresql.org/issues/5366>`_ -  Added alert message to Reset Layout if any of the panels from Query Tool failed to load.
diff --git a/web/pgadmin/misc/static/explain/js/explain.js b/web/pgadmin/misc/static/explain/js/explain.js
index f20a427e2..21167775d 100644
--- a/web/pgadmin/misc/static/explain/js/explain.js
+++ b/web/pgadmin/misc/static/explain/js/explain.js
@@ -994,6 +994,9 @@ define('pgadmin.misc.explain', [
         toolTipX = toolTipX < 0 ? 0 : (toolTipX);
         toolTipY = toolTipY < 0 ? 0 : (toolTipY);
 
+        toolTipX = toolTipX > graphContainer.width()-toolTipContainer[0].clientWidth ? graphContainer.width()-(toolTipContainer[0].clientWidth*zoomFactor) : toolTipX;
+        toolTipY = toolTipY > graphContainer.height()-toolTipContainer[0].clientHeight ? graphContainer.height()-(toolTipContainer[0].clientWidth*zoomFactor) : toolTipY;
+
         // Show toolTip at respective x,y coordinates
         toolTipContainer.css({
           'opacity': '0.8',