diff --git a/static/event-map.ts b/static/event-map.ts
index 57bc5d58ff5..687e25ae1ea 100644
--- a/static/event-map.ts
+++ b/static/event-map.ts
@@ -151,13 +151,13 @@ export type EventMap = {
     // TODO: There are no emitters for this event
     selectLine: (editorId: number, lineNumber: number) => void;
     settingsChange: (newSettings: SiteSettings) => void;
-    setToolInput: (compilerId: number, toolId: number, string: string) => void;
+    setToolInput: (compilerId: number, toolId: string, string: string) => void;
     shown: () => void;
     themeChange: (newTheme: Theme | null) => void;
     toolClosed: (compilerId: number, toolState: unknown) => void;
-    toolInputChange: (compilerId: number, toolId: number, input: string) => void;
-    toolInputViewClosed: (compilerId: number, toolId: number, input: string) => void;
-    toolInputViewCloseRequest: (compilerId: number, toolId: number) => void;
+    toolInputChange: (compilerId: number, toolId: string, input: string) => void;
+    toolInputViewClosed: (compilerId: number, toolId: string, input: string) => void;
+    toolInputViewCloseRequest: (compilerId: number, toolId: string) => void;
     toolOpened: (compilerId: number, toolState: unknown) => void;
     toolSettingsChange: (compilerId: number) => void;
     treeClose: (treeId: number) => void;
diff --git a/static/panes/tool-input-view.interfaces.ts b/static/panes/tool-input-view.interfaces.ts
index 18c028864d8..6744cb9b7b0 100644
--- a/static/panes/tool-input-view.interfaces.ts
+++ b/static/panes/tool-input-view.interfaces.ts
@@ -23,6 +23,6 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 export interface ToolInputViewState {
-    toolId: number;
+    toolId: string;
     toolName: string;
 }
diff --git a/static/panes/tool-input-view.ts b/static/panes/tool-input-view.ts
index b749393ad2a..fd8daf3d4a7 100644
--- a/static/panes/tool-input-view.ts
+++ b/static/panes/tool-input-view.ts
@@ -32,10 +32,9 @@ import {Container} from 'golden-layout';
 import {MonacoPaneState} from './pane.interfaces';
 import {Hub} from '../hub';
 import {ToolInputViewState} from './tool-input-view.interfaces';
-import {Settings} from '../settings';
 
 export class ToolInputView extends MonacoPane<monaco.editor.IStandaloneCodeEditor, ToolInputViewState> {
-    _toolId: number;
+    _toolId: string;
     _toolName: string;
     shouldSetSelectionInitially: boolean;
     debouncedEmitChange: (() => void) & _.Cancelable;