diff --git a/code/modules/nano/interaction/base.dm b/code/modules/nano/interaction/base.dm
index 8245ee04ed..45f141b608 100644
--- a/code/modules/nano/interaction/base.dm
+++ b/code/modules/nano/interaction/base.dm
@@ -3,10 +3,12 @@
 
 /datum/proc/nano_container()
 	return src
-
+	
+/* //CHOMPedit: I guess we have nanoUI again? Upstream doesnt.
 /datum/proc/CanUseTopic(var/mob/user, var/datum/topic_state/state)
 	var/src_object = nano_host()
 	return state.can_use_topic(src_object, user)
+*/
 
 /datum/topic_state/proc/href_list(var/mob/user)
 	return list()
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index 2973d51668..775bf0c522 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -20,9 +20,9 @@
 		return
 
 	if(isobserver(user))
-		// // If they turn on ghost AI control, admins can always interact.
-		// if(user.client.advanced_admin_interaction)
-		// 	. = max(., STATUS_INTERACTIVE)
+		// Admins can always interact.
+		if(check_rights(R_ADMIN|R_EVENT, 0, src))
+			. = max(., STATUS_INTERACTIVE)
 
 		// Regular ghosts can always at least view if in range.
 		if(user.client)
@@ -122,4 +122,8 @@
 /mob/living/carbon/human/shared_living_tgui_distance(atom/movable/src_object)
 	if((TK in mutations) && (get_dist(src, src_object) <= 2))
 		return STATUS_INTERACTIVE
-	return ..()
\ No newline at end of file
+	return ..()
+
+// Topic Extensions for old UIs
+/datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state)
+	return tgui_status(user, state)