 
   fetchAppsFromDb:(callback)->
 
-    @appStorage.fetchValue 'apps', (apps)=>
-      if apps and Object.keys(apps).length > 0
-        @constructor.manifests = apps
-        callback null, apps
+    @appStorage.fetchStorage (storage)=>
+
+      apps = @appStorage.getValue 'apps'
+      shortcuts = @appStorage.getValue 'shortcuts'
+
+      justFetchApps = =>
+        if apps and Object.keys(apps).length > 0
+          @constructor.manifests = apps
+          callback null, apps
+        else
+          callback new Error "There are no apps in the app storage."
+
+      if not shortcuts
+        @putDefaultShortcutsToAppStorage =>
+          justFetchApps()
       else
-        callback new Error "There are no apps in the app storage."
+        justFetchApps()
 
   fetchCompiledApp:(manifest, callback)->
 

    super

    @kiteController = @getSingleton('kiteController')
    @appStorage = new AppStorage 'KodingApps', '1.0'

    @appStorage.fetchStorage (storage)=>
      if not @appStorage.getValue 'shortcuts'
        @putDefaultShortcutsToAppStorage()

  # #
  # FETCHERS
  # #

  fetchApps:(callback)->

    if Object.keys(@constructor.manifests).length isnt 0
      callback null, @constructor.manifests

        description : 'Image Editor'
        author      : 'Autodesk'

    @appStorage.reset()
    @appStorage.setValue 'shortcuts', shortcuts, callback

  putAppsToAppStorage:(apps)->

