diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 26e825b2f5..e9edc83517 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -1242,11 +1242,23 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
 			// Save the current mode before going to fullscreen
 			AuiCurrent = m_Mgr->SavePerspective();
 			m_Mgr->LoadPerspective(AuiFullscreen, true);
+
+			// Hide toolbar
+			DoToggleToolbar(false);
+
+			// Disable toggling toolbar in menu
+			GetMenuBar()->FindItem(IDM_TOGGLE_TOOLBAR)->Enable(false);
 		}
 		else
 		{
 			// Restore saved perspective
 			m_Mgr->LoadPerspective(AuiCurrent, true);
+
+			// Restore toolbar to the status it was at before going fullscreen.
+			DoToggleToolbar(SConfig::GetInstance().m_InterfaceToolbar);
+
+			// Re-enable toggling toolbar in menu
+			GetMenuBar()->FindItem(IDM_TOGGLE_TOOLBAR)->Enable(true);
 		}
 	}
 	else