From 921c99b20131bac43c0ebe5e7f202bc2d54a70ca Mon Sep 17 00:00:00 2001
From: Anthony Laibe <anthony@laibe.cc>
Date: Wed, 3 Oct 2018 15:56:19 +0100
Subject: [PATCH] Improve feeling when switching tab

---
 embark-ui/src/components/DataWrapper.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/embark-ui/src/components/DataWrapper.js b/embark-ui/src/components/DataWrapper.js
index 71eb5719d..7215a6a0b 100644
--- a/embark-ui/src/components/DataWrapper.js
+++ b/embark-ui/src/components/DataWrapper.js
@@ -9,14 +9,14 @@ const DataWrapper = ({error, loading, shouldRender, render, ...rest}) => {
     return <Error error={error} />;
   }
 
-  if (loading) {
-    return <Loading />;
-  }
-
   if (shouldRender) {
     return render(rest);
   }
 
+  if (loading) {
+    return <Loading />;
+  }
+
   return <React.Fragment />;
 };