diff --git a/VDS/Components/TextFields/EntryField/EntryField.swift b/VDS/Components/TextFields/EntryField/EntryField.swift
index 5e500b9a..7774d542 100644
--- a/VDS/Components/TextFields/EntryField/EntryField.swift
+++ b/VDS/Components/TextFields/EntryField/EntryField.swift
@@ -234,7 +234,7 @@ open class EntryField: Control, Accessable {
     }
     
     open func getToolTipView() -> UIView? {
-        guard let tooltipTitle, let tooltipContent else {
+        guard let tooltipTitle, let tooltipContent, !tooltipTitle.isEmpty, !tooltipContent.isEmpty else {
            return nil
         }
         
@@ -351,9 +351,10 @@ open class EntryField: Control, Accessable {
         if let view = getToolTipView(), let oldText = updatedLabelText {
             tooltipView = view
             let toolTipAction = PassthroughSubject<Void, Never>()
-            let toolTipUpdateText = "\(oldText) "  //create a little space between the final character and tooltip image
+            let toolTipUpdateText = "\(oldText)  "  //create a little space between the final character and tooltip image
+
             let toolTipAttribute = ToolTipLabelAttribute(action: toolTipAction,
-                                                location: toolTipUpdateText.count,
+                                                location: toolTipUpdateText.count - 1,
                                                 length: 1,
                                                 tintColor: primaryColorConfig.getColor(self))
             updatedLabelText = toolTipUpdateText