diff --git a/remoteappmanager/static/css/remoteappmanager.css b/remoteappmanager/static/css/remoteappmanager.css
index 1cf69f4fe..344cd3d80 100644
--- a/remoteappmanager/static/css/remoteappmanager.css
+++ b/remoteappmanager/static/css/remoteappmanager.css
@@ -156,6 +156,29 @@ li a .stop-button:hover {
     display: block;
 }
 
+/* transition effect */
+.fade-enter-active {
+  transition: opacity .3s
+}
+.fade-leave-active {
+  transition: opacity 2.0s
+}
+.fade-enter, .fade-leave-to {
+  opacity: 0
+}
+
+.list-enter, .list-leave-to {
+  opacity: 0;
+  transform: translateX(-50px);
+}
+.list-enter-active, .list-leave-active {
+  transition: all 0.5s;
+  position: absolute;
+}
+.list-move {
+  transition: transform .5s;
+}
+
 .truncate {
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/remoteappmanager/static/js/home/views/application_list_view.js b/remoteappmanager/static/js/home/views/application_list_view.js
index c50d6766b..6996e622e 100644
--- a/remoteappmanager/static/js/home/views/application_list_view.js
+++ b/remoteappmanager/static/js/home/views/application_list_view.js
@@ -16,7 +16,7 @@ define([
               '  <li class="header">APPLICATIONS</li>' +
               '</ul>' +
 
-              '<ul id="applistentries" class="sidebar-menu">' +
+              '<ul class="sidebar-menu">' +
               '  <li v-show="!model.loading && model.app_list.length === 0">' +
               '    <a href="#">No applications found</a>' +
               '  </li>' +
@@ -28,9 +28,11 @@ define([
               '      <span>Loading</span>' +
               '    </a>' +
               '  </li>' +
+              '</ul>' +
 
               '  <!-- Application list -->' +
-              '  <li v-for="app in visible_list"' +
+              '<transition-group name="list" tag="ul" id="applistentries" class="sidebar-menu">' +
+              '  <li v-for="app in visible_list" v-bind:key="app"' +
               '      :class="{ active: index_of(app) === model.selected_index }"' +
               '      @click="model.selected_index = index_of(app); $emit(\'entry_clicked\');">' +
 
@@ -49,7 +51,7 @@ define([
               '      <span>{{ app.app_data.image | app_name }}</span>' +
               '    </a>' +
               '  </li>' +
-              '</ul>' +
+              '</transition-group>' +
               '<!-- /.sidebar-menu -->' +
             '</section>' +
             '<!-- /.sidebar -->',
diff --git a/remoteappmanager/static/js/home/views/application_view.js b/remoteappmanager/static/js/home/views/application_view.js
index b193ed65f..240fe22c1 100644
--- a/remoteappmanager/static/js/home/views/application_view.js
+++ b/remoteappmanager/static/js/home/views/application_view.js
@@ -12,7 +12,8 @@ define([
             '         v-if="current_app !== null"' +
             '         :class="{ content: true, \'no-padding\': current_app.is_running() }">' +
             '  <!-- Start Form -->' +
-            '  <div v-if="!current_app.is_running()" class="row">' +
+            '  <transition name="fade" v-if="!current_app.is_running()">' +
+            '  <div v-if="current_app.is_stopped()" class="row">' +
             '    <div class="col-md-offset-2 col-md-8">' +
             '      <div class="box box-primary">' +
             '        <div class="box-header with-border">' +
@@ -55,6 +56,7 @@ define([
             '      </div>' +
             '    </div>' +
             '  </div>' +
+            '  </transition>' +
 
             '  <!-- Application View -->' +
             '  <iframe v-if="current_app.is_running()"' +
diff --git a/selenium_tests/test_hide_application.py b/selenium_tests/test_hide_application.py
index 47e20ed1b..0a77f2def 100644
--- a/selenium_tests/test_hide_application.py
+++ b/selenium_tests/test_hide_application.py
@@ -1,23 +1,22 @@
 # -*- coding: utf-8 -*-
 from selenium_tests.selenium_test_base import SeleniumTestBase
+from selenium.webdriver.common.by import By
 
 
 class TestHideApplication(SeleniumTestBase):
     def test_hide_application(self):
         driver = self.driver
         with self.login():
-            self.wait_for(
-                lambda:
-                driver.find_element_by_css_selector(
-                    "#applistentries > li > a > span").text != "Loading")
+            self.wait_for(lambda:
+                          driver.find_element_by_css_selector(
+                              "#loading-spinner").value_of_css_property(
+                              'display') == "none")
 
             # Click on the search box
             search_box = driver.find_element_by_name("q")
             search_box.clear()
             search_box.send_keys('foobarheho')
 
-            self.wait_for(
-                lambda:
-                driver.find_element_by_css_selector(
-                    "#applistentries > li").value_of_css_property(
-                        'display') == "none")
+            self.wait_for(lambda:
+                          not self.is_element_present(
+                              By.CSS_SELECTOR, '#applistentries > li'))
diff --git a/selenium_tests/test_start_stop_container.py b/selenium_tests/test_start_stop_container.py
index 99dee15d6..ac311404a 100644
--- a/selenium_tests/test_start_stop_container.py
+++ b/selenium_tests/test_start_stop_container.py
@@ -8,8 +8,9 @@ def test_start_stop_container(self):
         driver = self.driver
         with self.login():
             self.wait_for(lambda:
-                driver.find_element_by_css_selector(
-                    "#applistentries > li > a > span").text != "Loading")
+                          driver.find_element_by_css_selector(
+                              "#loading-spinner").value_of_css_property(
+                              'display') == "none")
 
             self.click_by_css_selector("#applistentries > li > a > img")
             self.click_by_css_selector(".start-button")