diff --git a/src/gui/fsm.cpp b/src/gui/fsm.cpp
index 27b11aa..7b06094 100644
--- a/src/gui/fsm.cpp
+++ b/src/gui/fsm.cpp
@@ -75,11 +75,11 @@ namespace gui {
   }
 
   void FSM::ATTACKING(Event ev, std::any data) {
-    // if(!$main_ui.hands_playing()) {
+    if(!$main_ui.hands_playing()) {
       // run combat one more time
       $systems.runCombat(0);
       state(State::IDLE);
-    // }
+    }
   }
 
   void FSM::ROTATING(Event) {
diff --git a/src/gui/main_ui.cpp b/src/gui/main_ui.cpp
index 1d5cd2b..b8cacf3 100644
--- a/src/gui/main_ui.cpp
+++ b/src/gui/main_ui.cpp
@@ -144,6 +144,10 @@ namespace gui {
     if(!$hand_anim.playing) $hand_anim.play();
   }
 
+  bool MainUI::hands_playing() {
+    return $hand_anim.playing;
+  }
+
   void MainUI::render_hands() {
     if($hand_anim.playing) {
       $hand_anim.update();
@@ -152,4 +156,12 @@ namespace gui {
       $window.draw(*$hand.sprite);
     }
   }
+
+  void MainUI::show_combat() {
+    $overlay_ui.show_sprite("top_right", "combat_active");
+  }
+
+  void MainUI::close_combat() {
+    $overlay_ui.close_sprite("top_right");
+  }
 }
diff --git a/src/gui/main_ui.hpp b/src/gui/main_ui.hpp
index 7cb35af..31ff3c9 100644
--- a/src/gui/main_ui.hpp
+++ b/src/gui/main_ui.hpp
@@ -48,5 +48,8 @@ namespace gui {
     void render_mind_reading();
     void play_hands();
     void render_hands();
+    void show_combat();
+    void close_combat();
+    bool hands_playing();
   };
 }