diff --git a/demos/calc.cpp b/demos/calc.cpp
index d22e1b5..14417b1 100644
--- a/demos/calc.cpp
+++ b/demos/calc.cpp
@@ -157,13 +157,13 @@ struct CalculatorUI {
       auto& label = LABELS.at(name);
 
       $gui.set<guecs::Rectangle>(id, {});
-      $gui.set<guecs::Effect>(id, {});
 
       if(name == "readout") {
         $gui.set<guecs::Textual>(id, {L"", 40});
       } else if(name == "stack") {
         $gui.set<guecs::Textual>(id, {L"", 20});
       } else {
+        $gui.set<guecs::Effect>(id, {});
         $gui.set<guecs::Label>(id, { label });
         wchar_t op = label[0];
         $gui.set<guecs::Clickable>(id, {
diff --git a/include/guecs/ui.hpp b/include/guecs/ui.hpp
index f2022cc..cffca14 100644
--- a/include/guecs/ui.hpp
+++ b/include/guecs/ui.hpp
@@ -213,7 +213,7 @@ namespace guecs {
           sf::Shader *shader_ptr = nullptr;
 
           if(auto shader = get_if<Effect>(ent)) {
-            if(shader->$active && !is_shape) {
+            if(shader->$active) {
               auto ptr = shader->checkout_ptr();
               ptr->setUniform("is_shape", is_shape);
               // NOTE: this is needed because SFML doesn't handle shared_ptr
diff --git a/src/guecs/ui.cpp b/src/guecs/ui.cpp
index 2e233c1..50c8b3f 100644
--- a/src/guecs/ui.cpp
+++ b/src/guecs/ui.cpp
@@ -124,7 +124,7 @@ namespace guecs {
     });
 
     query<Textual>([&](auto ent, auto& text) {
-        render_helper(window, ent, true, text.text);
+        render_helper(window, ent, false, text.text);
     });
   }