diff --git a/Sources/Plugins/System Profiler/Classes/TPISystemProfiler.m b/Sources/Plugins/System Profiler/Classes/TPISystemProfiler.m
index aefbc4422..3a7bf268a 100755
--- a/Sources/Plugins/System Profiler/Classes/TPISystemProfiler.m	
+++ b/Sources/Plugins/System Profiler/Classes/TPISystemProfiler.m	
@@ -112,6 +112,17 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)userInputCommandInvokedOnClient:(IRCClient *)client
 						  commandString:(NSString *)commandString
 						  messageString:(NSString *)messageString
+{
+	XRPerformBlockAsynchronouslyOnMainQueue(^{
+		[self _userInputCommandInvokedOnClient:client
+								 commandString:commandString
+								 messageString:messageString];
+	});
+}
+
+- (void)_userInputCommandInvokedOnClient:(IRCClient *)client
+						   commandString:(NSString *)commandString
+						   messageString:(NSString *)messageString
 {
 	IRCChannel *channel = mainWindow().selectedChannel;
 
diff --git a/Sources/Plugins/User Insights/Classes/TPIUserInsights.m b/Sources/Plugins/User Insights/Classes/TPIUserInsights.m
index e7ba85b45..6ca910501 100755
--- a/Sources/Plugins/User Insights/Classes/TPIUserInsights.m	
+++ b/Sources/Plugins/User Insights/Classes/TPIUserInsights.m	
@@ -47,6 +47,17 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)userInputCommandInvokedOnClient:(IRCClient *)client
 						  commandString:(NSString *)commandString
 						  messageString:(NSString *)messageString
+{
+	XRPerformBlockAsynchronouslyOnMainQueue(^{
+		[self _userInputCommandInvokedOnClient:client 
+								 commandString:commandString
+								 messageString:messageString];
+	});
+}
+
+- (void)_userInputCommandInvokedOnClient:(IRCClient *)client
+						   commandString:(NSString *)commandString
+						   messageString:(NSString *)messageString
 {
 	IRCChannel *channel = mainWindow().selectedChannel;
 	
diff --git a/Sources/Plugins/ZNC Additions/Classes/TPI_ZNCAdditions.m b/Sources/Plugins/ZNC Additions/Classes/TPI_ZNCAdditions.m
index 0e5e67941..4cfb589d4 100755
--- a/Sources/Plugins/ZNC Additions/Classes/TPI_ZNCAdditions.m	
+++ b/Sources/Plugins/ZNC Additions/Classes/TPI_ZNCAdditions.m	
@@ -73,6 +73,17 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)userInputCommandInvokedOnClient:(IRCClient *)client
 						  commandString:(NSString *)commandString
 						  messageString:(NSString *)messageString
+{
+	XRPerformBlockAsynchronouslyOnMainQueue(^{
+		[self _userInputCommandInvokedOnClient:client
+								 commandString:commandString
+								 messageString:messageString];
+	});
+}
+
+- (void)_userInputCommandInvokedOnClient:(IRCClient *)client
+						   commandString:(NSString *)commandString
+						   messageString:(NSString *)messageString
 {
 	/* Throw error if user tries to invoke a command that requires the
 	 user to be connected to a ZNC bouncer */
@@ -128,20 +139,18 @@ NS_ASSUME_NONNULL_BEGIN
 			return;
 		}
 
-		XRPerformBlockSynchronouslyOnMainQueue(^{
-			SFCertificateTrustPanel *panel = [SFCertificateTrustPanel new];
+		SFCertificateTrustPanel *panel = [SFCertificateTrustPanel new];
 
-			[panel setDefaultButtonTitle:TXTLS(@"Prompts[aqw-q1]")];
+		[panel setDefaultButtonTitle:TXTLS(@"Prompts[aqw-q1]")];
 
-			[panel setAlternateButtonTitle:nil];
+		[panel setAlternateButtonTitle:nil];
 
-			[panel beginSheetForWindow:[NSApp mainWindow]
-						 modalDelegate:nil
-						didEndSelector:NULL
-						   contextInfo:NULL
-						  certificates:(__bridge NSArray *)certificateArray
-							 showGroup:YES];
-		});
+		[panel beginSheetForWindow:[NSApp mainWindow]
+					 modalDelegate:nil
+					didEndSelector:NULL
+					   contextInfo:NULL
+					  certificates:(__bridge NSArray *)certificateArray
+						 showGroup:YES];
 
 		CFRelease(certificateArray);
 	}