@@ -46,10 +46,18 @@ class SPythonConsoleEditableTextBox : public SEditableTextBox
 			]);
 	}
 
+	void SetPythonBox(SPythonConsoleInputBox *box) {
+		SPythonConsoleEditableText *PythonEditableText = (SPythonConsoleEditableText *)EditableText.Get();
+		PythonEditableText->PythonConsoleInputBox = box;
+	}
+
 private:
 	class SPythonConsoleEditableText : public SEditableText
 	{
 	public:
+
+		SPythonConsoleInputBox *PythonConsoleInputBox;
+
 		SLATE_BEGIN_ARGS(SPythonConsoleEditableText) {}
 		/** The text that appears when there is nothing typed into the search box */
 		SLATE_ATTRIBUTE(FText, HintText)
@@ -81,6 +89,22 @@ class SPythonConsoleEditableTextBox : public SEditableTextBox
 			{
 				return FReply::Unhandled();
 			}
+			else if (InKeyEvent.GetKey() == EKeys::Up) {
+				if (PythonConsoleInputBox->HistoryPosition > 0) {
+					PythonConsoleInputBox->HistoryPosition--;
+					this->SetText(FText::FromString(PythonConsoleInputBox->History[PythonConsoleInputBox->HistoryPosition]));
+				}
+
+				return FReply::Handled();
+			}
+			else if (InKeyEvent.GetKey() == EKeys::Down) {
+				if (PythonConsoleInputBox->HistoryPosition < PythonConsoleInputBox->History.Num() - 2) {
+					PythonConsoleInputBox->HistoryPosition++;
+					this->SetText(FText::FromString(PythonConsoleInputBox->History[PythonConsoleInputBox->HistoryPosition]));
+				}
+
+				return FReply::Handled();
+			}
 			else
 			{
 				return SEditableText::OnKeyDown(MyGeometry, InKeyEvent);
@@ -128,7 +152,7 @@ SPythonConsoleInputBox::SPythonConsoleInputBox()
 	: bIgnoreUIUpdate(false)
 {
 	FScopePythonGIL gil;
-	
+
 }
 
 BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
@@ -144,6 +168,9 @@ void SPythonConsoleInputBox::Construct(const FArguments& InArgs)
 		.HintText(NSLOCTEXT("PythonConsole", "TypeInConsoleHint", "Enter python command"))
 
 		];
+
+	SPythonConsoleEditableTextBox *TextBox = (SPythonConsoleEditableTextBox *)InputText.Get();
+	TextBox->SetPythonBox(this);
 }
 void SPythonConsoleInputBox::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
 {
@@ -170,6 +197,9 @@ void SPythonConsoleInputBox::OnTextCommitted(const FText& InText, ETextCommit::T
 			// re-entered.  We want to make sure the text string is empty on re-entry, so we'll clear it out
 			const FString ExecString = InText.ToString();
 
+			this->History.Add(ExecString);
+			this->HistoryPosition = this->History.Num();
+
 			UE_LOG(LogTemp, Log, TEXT(">>> %s"), *ExecString);
 
 			// Clear the console input area
@@ -182,7 +212,7 @@ void SPythonConsoleInputBox::OnTextCommitted(const FText& InText, ETextCommit::T
 			FUnrealEnginePythonModule &PythonModule = FModuleManager::GetModuleChecked<FUnrealEnginePythonModule>("UnrealEnginePython");
 			PythonModule.RunString(TCHAR_TO_UTF8(*ExecString));
 
-			
+
 		}
 
 	}
 
@@ -60,6 +60,11 @@ class SPythonConsoleInputBox
 	/** SWidget interface */
 	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
 
+
+	TArray<FString> History;
+	int HistoryPosition;
+
+
 protected:
 
 	virtual bool SupportsKeyboardFocus() const override { return true; }