diff --git a/chrome/content/zotero/xpcom/sync/syncRunner.js b/chrome/content/zotero/xpcom/sync/syncRunner.js
index 435cc7dc2c..4aa79f6a9c 100644
--- a/chrome/content/zotero/xpcom/sync/syncRunner.js
+++ b/chrome/content/zotero/xpcom/sync/syncRunner.js
@@ -1601,12 +1601,12 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 	 *
 	 * If no label passed, unregister current label
 	 *
-	 * @param {Tooltip} [tooltip]
+	 * @param {π} [tooltip]
 	 */
 	this.registerSyncStatus = function (tooltip) {
 		if (tooltip) {
-			_currentSyncStatusLabel = tooltip.firstChild.nextSibling;
-			_currentLastSyncLabel = tooltip.firstChild.nextSibling.nextSibling;
+			_currentSyncStatusLabel = tooltip.querySelector('.sync-button-tooltip-status');
+			_currentLastSyncLabel = tooltip.querySelector('.sync-button-tooltip-last-sync');
 			_currentTooltipMessages = tooltip.querySelector('.sync-button-tooltip-messages');
 		}
 		else {
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 5f50698a98..7c4977db7b 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -848,8 +848,8 @@
 												onpopuphiding="Zotero.Sync.Runner.registerSyncStatus()"
 												noautohide="true">
 											<label id="zotero-tb-sync-label"/>
-											<label id="zotero-tb-sync-status" hidden="true"/>
-											<label id="zotero-tb-sync-last-sync"/>
+											<label id="zotero-tb-sync-status" class="sync-button-tooltip-status" hidden="true"/>
+											<label id="zotero-tb-sync-last-sync" class="sync-button-tooltip-last-sync"/>
 											<div xmlns="http://www.w3.org/1999/xhtml" class="sync-button-tooltip-messages"/>
 										</tooltip>
 									</toolbarbutton>