diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 8108a8c910..85f8b069a1 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -406,11 +406,11 @@ CFrame::CFrame(wxFrame* parent,
 	m_LogWindow = new CLogWindow(this, IDM_LOGWINDOW);
 	m_LogWindow->Hide();
 	m_LogWindow->Disable();
-
-	g_TASInputDlg = new TASInputDlg(this);
-	g_TASInputDlg1 = new TASInputDlg(this);
-    g_TASInputDlg2 = new TASInputDlg(this);
-    g_TASInputDlg3 = new TASInputDlg(this);
+    
+    g_TASInputDlg[0] = new TASInputDlg(this);
+	g_TASInputDlg[1] = new TASInputDlg(this);
+    g_TASInputDlg[2] = new TASInputDlg(this);
+    g_TASInputDlg[3] = new TASInputDlg(this);
     
 	Movie::SetInputManip(TASManipFunction);
 
@@ -896,33 +896,17 @@ void OnAfterLoadCallback()
 
 void TASManipFunction(SPADStatus *PadStatus, int controllerID)
 {
-	if (main_frame && controllerID == 0)
-		main_frame->g_TASInputDlg->GetValues(PadStatus, controllerID);
-    
-    if (main_frame && controllerID == 1)
-		main_frame->g_TASInputDlg1->GetValues(PadStatus, controllerID);
-    
-    if (main_frame && controllerID == 2)
-		main_frame->g_TASInputDlg2->GetValues(PadStatus, controllerID);
-    
-    if (main_frame && controllerID == 3)
-		main_frame->g_TASInputDlg3->GetValues(PadStatus, controllerID);
+	if (main_frame)
+		main_frame->g_TASInputDlg[controllerID]->GetValues(PadStatus, controllerID);
 }
 
 bool TASInputHasFocus()
 {
-    if(main_frame->g_TASInputDlg->TASInputDlgHasFocus())
-        return true;
-    
-    if(main_frame->g_TASInputDlg1->TASInputDlgHasFocus())
-        return true;
-    
-    if(main_frame->g_TASInputDlg2->TASInputDlgHasFocus())
-        return true;
-    
-    if(main_frame->g_TASInputDlg3->TASInputDlgHasFocus())
-        return true;
-    
+    for(int i = 0; i < 4; i++)
+    {
+        if(main_frame->g_TASInputDlg[i]->TASInputDlgHasFocus())
+            return true;
+    }
     return false;
 }
 
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index c806eef643..159f63b93d 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -120,10 +120,7 @@ public:
 	CCodeWindow* g_pCodeWindow;
 	NetPlaySetupDiag* g_NetPlaySetupDiag;
 	wxCheatsWindow* g_CheatsWindow;
-	TASInputDlg* g_TASInputDlg;
-    TASInputDlg* g_TASInputDlg1;
-    TASInputDlg* g_TASInputDlg2;
-    TASInputDlg* g_TASInputDlg3;
+	TASInputDlg* g_TASInputDlg[4];
     
 	void InitBitmaps();
 	void DoPause();
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index f24f057740..44d7550a9d 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -27,7 +27,6 @@ window handle that is returned by CreateWindow() can be accessed from
 Core::GetWindowHandle().
 */
 
-
 #include "Setup.h" // Common
 
 #include "NetWindow.h"
@@ -99,6 +98,8 @@ extern "C" {
 #include "../resources/KDE.h"
 };
 
+#include <stdio.h>
+
 // Create menu items
 // ---------------------
 void CFrame::CreateMenu()
@@ -699,28 +700,15 @@ void CFrame::OnRecordReadOnly(wxCommandEvent& event)
 
 void CFrame::OnTASInput(wxCommandEvent& event)
 {
-    if(SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg->Show(true);
-        g_TASInputDlg->SetTitle("TAS Input - Controller 1");
-    }
+    std::string number[4] = {"1","2","3","4"};
     
-    if(SConfig::GetInstance().m_SIDevice[1] == SIDEVICE_GC_CONTROLLER)
+    for(int i = 0; i < 4; i++)
     {
-        g_TASInputDlg1->Show(true);
-        g_TASInputDlg1->SetTitle("TAS Input - Controller 2");
-    }
-        
-    if(SConfig::GetInstance().m_SIDevice[2] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg2->Show(true);
-        g_TASInputDlg2->SetTitle("TAS Input - Controller 3");
-    }
-    
-    if(SConfig::GetInstance().m_SIDevice[3] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg3->Show(true);
-        g_TASInputDlg3->SetTitle("TAS Input - Controller 4");
+        if(SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER)
+        {
+            g_TASInputDlg[i]->Show(true);
+            g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]);
+        }
     }
 }