diff --git a/web/src/pages/Repository/RepositoryContent/FileContent/GitBlame.module.scss b/web/src/pages/Repository/RepositoryContent/FileContent/GitBlame.module.scss
index bab5043e8..a646a8017 100644
--- a/web/src/pages/Repository/RepositoryContent/FileContent/GitBlame.module.scss
+++ b/web/src/pages/Repository/RepositoryContent/FileContent/GitBlame.module.scss
@@ -51,6 +51,10 @@
         position: absolute;
         width: 100%;
 
+        &[data-block-top='-1'] {
+          display: none;
+        }
+
         &::before {
           position: absolute;
           z-index: 2;
diff --git a/web/src/pages/Repository/RepositoryContent/FileContent/GitBlame.tsx b/web/src/pages/Repository/RepositoryContent/FileContent/GitBlame.tsx
index c5720ef9a..bd47bc123 100644
--- a/web/src/pages/Repository/RepositoryContent/FileContent/GitBlame.tsx
+++ b/web/src/pages/Repository/RepositoryContent/FileContent/GitBlame.tsx
@@ -1,5 +1,4 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { throttle } from 'lodash-es'
 import { Avatar, Container, FontVariation, Layout, StringSubstitute, Text } from '@harness/uicore'
 import { LanguageDescription } from '@codemirror/language'
 import { indentWithTab } from '@codemirror/commands'
@@ -32,7 +31,7 @@ interface BlameBlock {
 
 type BlameBlockRecord = Record<number, BlameBlock>
 
-const BLAME_BLOCK_NOT_YET_CALCULATED_TOP_POSITION = -1
+const INITIAL_TOP_POSITION = -1
 
 export const GitBlame: React.FC<Pick<GitInfoProps, 'repoMetadata' | 'resourcePath'>> = ({
   repoMetadata,
@@ -55,8 +54,8 @@ export const GitBlame: React.FC<Pick<GitInfoProps, 'repoMetadata' | 'resourcePat
         blameBlocks[fromLineNumber] = {
           fromLineNumber,
           toLineNumber,
-          topPosition: BLAME_BLOCK_NOT_YET_CALCULATED_TOP_POSITION, // Not yet calculated
-          heights: {}, // Not yet calculated
+          topPosition: INITIAL_TOP_POSITION,
+          heights: {},
           commitInfo: commit,
           lines: lines,
           numberOfLines: lines?.length || 0
@@ -68,6 +67,7 @@ export const GitBlame: React.FC<Pick<GitInfoProps, 'repoMetadata' | 'resourcePat
       setBlameBlocks({ ...blameBlocks })
     }
   }, [data]) // eslint-disable-line react-hooks/exhaustive-deps
+
   const findBlockForLineNumber = useCallback(
     lineNumber => {
       let startLine = lineNumber
@@ -81,42 +81,55 @@ export const GitBlame: React.FC<Pick<GitInfoProps, 'repoMetadata' | 'resourcePat
 
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const onViewUpdate = useCallback(
-    throttle(({ view, geometryChanged }: ViewUpdate) => {
+    ({ view, geometryChanged }: ViewUpdate) => {
       if (geometryChanged) {
         view.viewportLineBlocks.forEach(lineBlock => {
           const { from, top, height } = lineBlock
           const lineNumber = view.state.doc.lineAt(from).number
-          const blameBlockAtLineNumber = findBlockForLineNumber(lineNumber)
+          const blockAtLineNumber = findBlockForLineNumber(lineNumber)
 
-          if (!blameBlockAtLineNumber) {
+          if (!blockAtLineNumber) {
             // eslint-disable-next-line no-console
-            console.error('Bad math! Cannot find a block at line', lineNumber)
+            console.error('Bad math! Cannot find a blame block for line', lineNumber)
           } else {
-            if (blameBlockAtLineNumber.topPosition === BLAME_BLOCK_NOT_YET_CALCULATED_TOP_POSITION) {
-              blameBlockAtLineNumber.topPosition = top
+            if (blockAtLineNumber.topPosition === INITIAL_TOP_POSITION) {
+              blockAtLineNumber.topPosition = top
             }
 
             // CodeMirror reports top position of a block incorrectly sometimes, so we need to normalize it
-            // using the previous block.
+            // using dimensions of the previous block.
             if (lineNumber > 1) {
               const previousBlock = findBlockForLineNumber(lineNumber - 1)
 
-              if (previousBlock.fromLineNumber !== blameBlockAtLineNumber.fromLineNumber) {
-                const normalizedTop =
-                  previousBlock.topPosition + Object.values(previousBlock.heights).reduce((a, b) => a + b, 0)
-
-                blameBlockAtLineNumber.topPosition = normalizedTop
+              if (previousBlock.fromLineNumber !== blockAtLineNumber.fromLineNumber) {
+                blockAtLineNumber.topPosition = previousBlock.topPosition + computeHeight(previousBlock.heights)
               }
             }
 
-            blameBlockAtLineNumber.heights[lineNumber] = height
+            blockAtLineNumber.heights[lineNumber] = height
+
+            const blockDOM = document.querySelector(
+              `.${css.blameBox}[data-block-from-line="${blockAtLineNumber.fromLineNumber}"]`
+            ) as HTMLDivElement
+
+            if (blockDOM) {
+              const _height = `${computeHeight(blockAtLineNumber.heights)}px`
+              const _top = `${blockAtLineNumber.topPosition}px`
+
+              if (blockDOM.style.height !== _height || blockDOM.style.top !== _top) {
+                blockDOM.style.height = _height
+                blockDOM.style.top = _top
+
+                if (blockAtLineNumber.topPosition !== INITIAL_TOP_POSITION) {
+                  blockDOM.removeAttribute('data-block-top')
+                }
+              }
+            }
           }
         })
-
-        setBlameBlocks({ ...blameBlocks })
       }
-    }, 50),
-    [blameBlocks]
+    },
+    [] // eslint-disable-line react-hooks/exhaustive-deps
   )
 
   // TODO: Normalize loading and error rendering when implementing new Design layout
@@ -133,42 +146,9 @@ export const GitBlame: React.FC<Pick<GitInfoProps, 'repoMetadata' | 'resourcePat
     <Container className={css.gitBlame}>
       <Layout.Horizontal className={css.layout}>
         <Container className={css.blameColumn}>
-          {Object.values(blameBlocks)
-            .filter(({ topPosition }) => topPosition !== BLAME_BLOCK_NOT_YET_CALCULATED_TOP_POSITION)
-            .map(({ fromLineNumber, topPosition: top, heights, commitInfo }) => {
-              const height = Object.values(heights).reduce((a, b) => a + b, 0)
-
-              return (
-                <Container className={css.blameBox} key={fromLineNumber} height={height} style={{ top }}>
-                  <Layout.Horizontal spacing="small" className={css.blameBoxLayout}>
-                    <Container>
-                      <Avatar name={commitInfo?.author?.identity?.name} size="normal" hoverCard={false} />
-                    </Container>
-                    <Container style={{ flexGrow: 1 }}>
-                      <Layout.Vertical spacing="xsmall">
-                        <Text
-                          font={{ variation: FontVariation.BODY }}
-                          lineClamp={2}
-                          tooltipProps={{
-                            portalClassName: css.blameCommitPortalClass
-                          }}>
-                          {commitInfo?.title}
-                        </Text>
-                        <Text font={{ variation: FontVariation.BODY }} lineClamp={1}>
-                          <StringSubstitute
-                            str={getString('blameCommitLine')}
-                            vars={{
-                              author: <strong>{commitInfo?.author?.identity?.name as string}</strong>,
-                              timestamp: <ReactTimeago date={commitInfo?.author?.when as string} />
-                            }}
-                          />
-                        </Text>
-                      </Layout.Vertical>
-                    </Container>
-                  </Layout.Horizontal>
-                </Container>
-              )
-            })}
+          {Object.values(blameBlocks).map(blameInfo => (
+            <GitBlameMetaInfo key={blameInfo.fromLineNumber} {...blameInfo} />
+          ))}
         </Container>
         <Render when={Object.values(blameBlocks).length}>
           <GitBlameSourceViewer
@@ -210,33 +190,35 @@ interface EditorLinePaddingWidgetSpec extends LineWidgetSpec {
   blockLines: number
 }
 
-function GitBlameSourceViewer({ source, filename, onViewUpdate, blameBlocks }: GitBlameSourceViewerProps) {
-  const [view, setView] = useState<EditorView>()
+const GitBlameSourceViewer = React.memo(function GitBlameSourceViewer({
+  source,
+  filename,
+  onViewUpdate,
+  blameBlocks
+}: GitBlameSourceViewerProps) {
+  const view = useRef<EditorView>()
   const ref = useRef<HTMLDivElement>()
   const languageConfig = useMemo(() => new Compartment(), [])
-  const lineWidgetSpec = useMemo(() => {
-    const spec: EditorLinePaddingWidgetSpec[] = []
+
+  useEffect(() => {
+    const lineWidgetSpec: EditorLinePaddingWidgetSpec[] = []
 
     Object.values(blameBlocks).forEach(block => {
       const blockLines = block.numberOfLines
 
-      spec.push({
+      lineWidgetSpec.push({
         lineNumber: block.fromLineNumber,
         position: LineWidgetPosition.TOP,
         blockLines
       })
 
-      spec.push({
+      lineWidgetSpec.push({
         lineNumber: block.toLineNumber,
         position: LineWidgetPosition.BOTTOM,
         blockLines
       })
     })
 
-    return spec
-  }, [blameBlocks])
-
-  useEffect(() => {
     const customLineNumberGutter = gutter({
       lineMarker(_view, line) {
         const lineNumber: number = _view.state.doc.lineAt(line.from).number
@@ -282,25 +264,25 @@ function GitBlameSourceViewer({ source, filename, onViewUpdate, blameBlocks }: G
       parent: ref.current
     })
 
-    setView(editorView)
+    view.current = editorView
 
     return () => {
       editorView.destroy()
     }
-  }, []) // eslint-disable-line
+  }, []) // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
-    if (view && filename) {
+    if (filename) {
       languageDescriptionFrom(filename)
         ?.load()
         .then(languageSupport => {
-          view.dispatch({ effects: languageConfig.reconfigure(languageSupport) })
+          view.current?.dispatch({ effects: languageConfig.reconfigure(languageSupport) })
         })
     }
   }, [filename, view, languageConfig])
 
   return <Container ref={ref} className={css.main} />
-}
+})
 
 function languageDescriptionFrom(filename: string) {
   return LanguageDescription.matchFilename(languages, filename)
@@ -339,3 +321,50 @@ class EditorLinePaddingWidget extends WidgetType {
     return false
   }
 }
+
+function computeHeight(heights: Record<number, number>) {
+  return Object.values(heights).reduce((a, b) => a + b, 0)
+}
+
+function GitBlameMetaInfo({ fromLineNumber, toLineNumber, topPosition, heights, commitInfo }: BlameBlock) {
+  const height = computeHeight(heights)
+  const { getString } = useStrings()
+
+  return (
+    <Container
+      className={css.blameBox}
+      data-block-from-line={`${fromLineNumber}`}
+      data-block-to-line={`${toLineNumber}`}
+      data-block-top={`${topPosition}`}
+      key={`${fromLineNumber}-${height}`}
+      height={height}
+      style={{ top: topPosition }}>
+      <Layout.Horizontal spacing="small" className={css.blameBoxLayout}>
+        <Container>
+          <Avatar name={commitInfo?.author?.identity?.name} size="normal" hoverCard={false} />
+        </Container>
+        <Container style={{ flexGrow: 1 }}>
+          <Layout.Vertical spacing="xsmall">
+            <Text
+              font={{ variation: FontVariation.BODY }}
+              lineClamp={2}
+              tooltipProps={{
+                portalClassName: css.blameCommitPortalClass
+              }}>
+              {commitInfo?.title}
+            </Text>
+            <Text font={{ variation: FontVariation.BODY }} lineClamp={1}>
+              <StringSubstitute
+                str={getString('blameCommitLine')}
+                vars={{
+                  author: <strong>{commitInfo?.author?.identity?.name as string}</strong>,
+                  timestamp: <ReactTimeago date={commitInfo?.author?.when as string} />
+                }}
+              />
+            </Text>
+          </Layout.Vertical>
+        </Container>
+      </Layout.Horizontal>
+    </Container>
+  )
+}